sy
|
ea4b603c36
|
薪酬系统-薪资档案、核算，列表不要显示离职日期、核算人员确认页面范围列表不要显示离职日期
|
2023-07-24 11:26:36 +08:00 |
|
sy
|
b10a45ebda
|
薪酬系统-福利档案，列表不要显示合同到期日期
|
2023-07-24 10:57:34 +08:00 |
Harryxzy
|
ad6a571310
|
自定义工资项目展示名fix
|
2023-07-21 11:08:54 +08:00 |
 钱涛
|
0119161173
|
修复冲突
|
2023-07-21 10:46:55 +08:00 |
|
sy
|
40de6e0e6b
|
Merge remote-tracking branch 'remotes/origin/feature/230701-社保福利-核算记录的校验' into release/2.9.2.2307.02
|
2023-07-20 17:06:38 +08:00 |
|
sy
|
7b6a76cad7
|
薪酬系统-福利台账，导入福利项列表过滤出正常缴纳、补缴、补差细分项
|
2023-07-20 17:05:46 +08:00 |
|
钱涛
|
a643f43656
|
修复档案模板名称异常
|
2023-07-20 16:46:12 +08:00 |
|
钱涛
|
d068ce0744
|
修复档案模板名称异常
|
2023-07-20 16:43:50 +08:00 |
|
Harryxzy
|
19c297dfe9
|
自定义工资项目展示名fix补发
|
2023-07-20 15:57:27 +08:00 |
|
Harryxzy
|
84d9184959
|
自定义工资项目展示名
|
2023-07-20 15:37:20 +08:00 |
|
Harryxzy
|
79ef1941b2
|
删除个税扣缴义务人时校验社保福利
|
2023-07-20 15:14:43 +08:00 |
|
Harryxzy
|
fd3abc7f65
|
自定义工资项目展示名
|
2023-07-20 14:12:33 +08:00 |
|
钱涛
|
38f3461c64
|
v1
|
2023-07-20 14:05:19 +08:00 |
|
钱涛
|
6bb66d0520
|
Merge branch 'release/2.9.2.2307.02' into release/230803对接个税
|
2023-07-20 11:21:19 +08:00 |
|
Harryxzy
|
ce32c6571c
|
系统薪资项目重名
|
2023-07-20 11:14:58 +08:00 |
|
Harryxzy
|
b95663ada8
|
自定义工资项目展示名
|
2023-07-20 10:42:16 +08:00 |
|
钱涛
|
e75d5ab427
|
v1
|
2023-07-20 10:36:29 +08:00 |
|
钱涛
|
c0660e5476
|
暂存
|
2023-07-20 10:36:28 +08:00 |
|
sy
|
c7fe4fee23
|
Merge branches 'feature/230701-社保福利-核算记录的校验' and 'feature/230701-薪资核算-导出功能可选择字段导出' into release/2.9.2.2307.02
|
2023-07-20 10:19:40 +08:00 |
|
钱涛
|
b98fc4c527
|
非系统人员冲突
|
2023-07-20 10:17:20 +08:00 |
|
钱涛
|
01b02531ce
|
Merge branch 'feature/外部人员' into release/2.9.2.2307.02
# Conflicts:
# src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-20 10:08:05 +08:00 |
|
sy
|
1c83f1ab0e
|
薪酬系统-薪资核算，归档action逻辑优化
|
2023-07-19 18:02:44 +08:00 |
|
钱涛
|
013137ba30
|
非系统人员状态是临时
|
2023-07-19 17:07:38 +08:00 |
|
Harryxzy
|
07b36db9e1
|
加上大括号
|
2023-07-19 16:27:55 +08:00 |
|
Harryxzy
|
5340b114d1
|
Merge branch 'feature/230701-工资单反馈' into feature/230702-自定义工资项目展示名
|
2023-07-19 16:19:53 +08:00 |
|
Harryxzy
|
ca0d800bab
|
Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02
|
2023-07-19 16:18:52 +08:00 |
|
Harryxzy
|
311aa8f139
|
加上大括号
|
2023-07-19 16:17:40 +08:00 |
|
Harryxzy
|
8e6bd24d0d
|
自定义工资项目展示名
|
2023-07-19 16:14:25 +08:00 |
|
Harryxzy
|
a144b88f6c
|
Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02
|
2023-07-19 11:51:50 +08:00 |
|
Harryxzy
|
31a863c937
|
没有设置工资单模板时报错
|
2023-07-19 11:51:31 +08:00 |
|
Harryxzy
|
959aa83a21
|
Merge branch 'fix/230701-个税扣缴义务人前后空格' into release/2.9.2.2307.02
|
2023-07-19 11:11:58 +08:00 |
|
Harryxzy
|
0a4c19fb36
|
Merge branch 'feature/230702-薪资项目-核算时隐藏' into release/2.9.2.2307.02
|
2023-07-19 11:11:46 +08:00 |
|
Harryxzy
|
57f75d36a0
|
fix个税扣缴义务人保存过滤前后空格
|
2023-07-19 11:10:27 +08:00 |
|
钱涛
|
3cc0d412ce
|
修复导出外部人员名称不显示问题
|
2023-07-19 10:58:11 +08:00 |
|
sy
|
4b503513f2
|
Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230701-薪资核算-导出功能可选择字段导出
|
2023-07-19 10:04:58 +08:00 |
|
sy
|
47b02e4d5d
|
薪酬系统-薪资核算，归档action
|
2023-07-19 10:03:29 +08:00 |
|
钱涛
|
b77e7a737c
|
外部人员名称不可重复
|
2023-07-19 09:58:42 +08:00 |
|
钱涛
|
5e227febee
|
关闭系统算税后，系统薪资项目可删除
|
2023-07-18 17:59:20 +08:00 |
|
Harryxzy
|
78e5d37cf3
|
薪资项目-核算时隐藏
|
2023-07-18 17:22:42 +08:00 |
|
Harryxzy
|
db9a0e22eb
|
薪资项目-核算时隐藏fixbug
|
2023-07-18 17:00:09 +08:00 |
|
Harryxzy
|
bbb8417008
|
自定义工资项目展示名temp
|
2023-07-18 16:28:29 +08:00 |
|
Harryxzy
|
d551f5ae76
|
薪资项目核算时隐藏
|
2023-07-18 14:03:59 +08:00 |
|
Harryxzy
|
b8f44dd5b6
|
薪资项目核算时隐藏
|
2023-07-18 11:00:13 +08:00 |
|
sy
|
7c3c929fcd
|
薪酬系统-福利方案，自定义福利项启用逻辑优化
|
2023-07-18 09:33:07 +08:00 |
|
sy
|
f93090b063
|
薪酬系统-薪资核算，自定义导出字段优化未分类字段识别逻辑
|
2023-07-17 17:53:59 +08:00 |
|
Harryxzy
|
3a1765b562
|
Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02
|
2023-07-17 15:02:33 +08:00 |
|
Harryxzy
|
1ea80b8fe9
|
工资单反馈
|
2023-07-17 15:01:14 +08:00 |
|
Harryxzy
|
88892f1aac
|
工资单反馈fixBug
|
2023-07-17 12:36:20 +08:00 |
|
Harryxzy
|
e83302caac
|
工资单反馈
|
2023-07-17 12:11:31 +08:00 |
|
Harryxzy
|
8221d4da69
|
工资单反馈
|
2023-07-17 11:27:40 +08:00 |
|
钱涛
|
fbdf93cf5b
|
取消不用系统算税时一系列校验
|
2023-07-17 10:20:54 +08:00 |
|
sy
|
b0e8da2ad4
|
薪酬系统-福利台账，列表排序规则账单月份逆序、更新时间逆序
|
2023-07-14 17:32:16 +08:00 |
|
sy
|
2e2954f706
|
薪酬系统-薪资核算，补缴和补差个人福利项明细核算失败问题修复
|
2023-07-14 14:43:30 +08:00 |
|
Harryxzy
|
faf9636a0d
|
薪资项目-核算时隐藏 temp
|
2023-07-14 11:34:53 +08:00 |
|
Harryxzy
|
6279f0d8c9
|
工资单反馈
|
2023-07-14 09:55:36 +08:00 |
|
sy
|
3571797e12
|
薪酬系统-薪资核算，薪资项目函数中增加福利核算明细项根据缴纳状态的细分项
|
2023-07-14 09:13:19 +08:00 |
|
钱涛
|
942a3b2a97
|
修复工资单发送列表
|
2023-07-13 17:23:28 +08:00 |
|
钱涛
|
873b90474f
|
Merge branch 'feature/230701qt' into feature/外部人员
|
2023-07-13 16:55:36 +08:00 |
|
钱涛
|
152eeaa68e
|
所有配置文件
|
2023-07-13 16:55:23 +08:00 |
|
钱涛
|
385726fa76
|
所有配置文件
|
2023-07-13 16:51:01 +08:00 |
|
sy
|
b007b1b351
|
薪酬系统-薪资核算，自定义导出字段
|
2023-07-13 14:43:54 +08:00 |
|
钱涛
|
0fc16efb11
|
核算界面获取外部人员
|
2023-07-13 14:11:54 +08:00 |
|
钱涛
|
4901f79066
|
核算界面获取外部人员
|
2023-07-13 14:11:32 +08:00 |
|
Harryxzy
|
30d61e352f
|
工资单确认反馈
|
2023-07-13 11:50:02 +08:00 |
|
钱涛
|
888938f150
|
系统设置接口
|
2023-07-13 11:33:58 +08:00 |
|
钱涛
|
23c0a78adc
|
修复外部人员初始化档案数据
|
2023-07-13 10:20:41 +08:00 |
|
sy
|
c78c8375f0
|
薪酬系统-薪资核算，自定义导出字段
|
2023-07-12 15:20:02 +08:00 |
|
Harryxzy
|
820d15d06f
|
工资单确认反馈
|
2023-07-12 15:17:59 +08:00 |
|
Harryxzy
|
58fe219cdb
|
fix 工资单反馈bug
|
2023-07-12 11:25:44 +08:00 |
|
钱涛
|
89ecf0984d
|
fix外部人员
|
2023-07-12 09:45:00 +08:00 |
|
sy
|
47dc9e35bd
|
薪酬系统-福利台账，已归档状态下重新核算按钮增加是否被薪资核算引用校验逻辑
|
2023-07-11 17:56:45 +08:00 |
|
Harryxzy
|
56c1666542
|
工资单发放
|
2023-07-11 17:51:52 +08:00 |
|
Harryxzy
|
5dc2dadd46
|
工资单自动确认
|
2023-07-11 17:28:15 +08:00 |
|
钱涛
|
aec6918c12
|
Merge branch 'release/2.9.1.2307.01' into feature/外部人员
# Conflicts:
# src/com/engine/salary/biz/EmployBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java
# src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/web/SalarySobController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2023-07-11 16:08:15 +08:00 |
|
Harryxzy
|
33a0723ad2
|
Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈
|
2023-07-11 15:29:21 +08:00 |
|
Harryxzy
|
be895829c2
|
工资单反馈
|
2023-07-11 15:29:13 +08:00 |
|
Harryxzy
|
5918de016e
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.9.1.2307.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
|
2023-07-11 13:24:37 +08:00 |
|
Harryxzy
|
fa950fb4dd
|
薪资项目排序比较
|
2023-07-11 13:23:07 +08:00 |
|
sy
|
fd9a9aef72
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 11:31:29 +08:00 |
|
sy
|
ad37ba9af0
|
薪酬系统-薪资档案，高级搜索中工号、分部筛选问题修复
|
2023-07-11 11:30:57 +08:00 |
|
sy
|
c28f782f19
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 11:11:15 +08:00 |
|
sy
|
83604ba534
|
薪酬系统-福利台账，修改台账列表返回台账状态值返回逻辑
|
2023-07-11 11:10:32 +08:00 |
|
钱涛
|
f53c904fde
|
Merge branch 'fix/230701修复项目添加时名称校验问题' into release/2.9.1.2307.01
|
2023-07-11 11:08:39 +08:00 |
|
钱涛
|
bb6cf386cb
|
修复
|
2023-07-11 11:05:35 +08:00 |
|
Harryxzy
|
7a72ef28d1
|
Merge remote-tracking branch 'origin/release/2.9.1.2307.01' into release/2.9.1.2307.01
|
2023-07-11 10:14:46 +08:00 |
|
Harryxzy
|
7d9ad3d79e
|
不允许删除薪资档案校验
|
2023-07-11 10:14:28 +08:00 |
|
sy
|
a55ca5182e
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 09:59:29 +08:00 |
|
sy
|
e67530eb87
|
薪酬系统-福利档案，导出加高级搜索问题修复
|
2023-07-10 17:20:04 +08:00 |
|
sy
|
b705161492
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索功能问题修复
|
2023-07-10 14:33:43 +08:00 |
|
Harryxzy
|
467746f7df
|
Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈
|
2023-07-10 11:12:03 +08:00 |
|
Harryxzy
|
584ebbc562
|
暂存
|
2023-07-10 11:11:52 +08:00 |
|
Harryxzy
|
0e2a6c8368
|
Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01
# Conflicts:
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/sys/entity/vo/AppSettingVO.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/web/SalarySystemConfigController.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-10 11:10:10 +08:00 |
|
sy
|
193e28758c
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参
|
2023-07-10 10:26:08 +08:00 |
|
Harryxzy
|
b7c58ecc11
|
Merge branch 'fix/累计专项附加扣除防抖动' into release/2.9.1.2307.01
|
2023-07-10 10:10:58 +08:00 |
|
Harryxzy
|
938f03946b
|
Merge branch 'feature/230701-系统薪资项目可配置删除' into release/2.9.1.2307.01
|
2023-07-10 10:09:52 +08:00 |
|
Harryxzy
|
9b7ba19d64
|
Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01
|
2023-07-10 10:09:45 +08:00 |
|
Harryxzy
|
e90bd66489
|
Merge branch 'feature/230701-删除档案' into release/2.9.1.2307.01
|
2023-07-10 10:09:38 +08:00 |
|
sy
|
b92c7ff599
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参
|
2023-07-07 15:32:12 +08:00 |
|
sy
|
9c34fb9497
|
薪酬系统-薪资核算，搜索条件新增字段
|
2023-07-07 11:47:43 +08:00 |
|
sy
|
fa28db9c79
|
薪酬系统-薪资核算，高级搜索和导出带入筛选条件未生效问题修复
|
2023-07-07 10:15:23 +08:00 |
|
Harryxzy
|
40fc4ea13c
|
工资单定时发送 调整周期类型
|
2023-07-05 11:39:54 +08:00 |
|
Harryxzy
|
508e324dac
|
工资单定时发送 添加 发放周期
|
2023-07-05 10:36:02 +08:00 |
|
Harryxzy
|
896e0c9e34
|
工资单定时发送 添加 发放周期
|
2023-07-05 09:59:45 +08:00 |
|
Harryxzy
|
c78839d8c0
|
工资单定时发送 添加 发放周期
|
2023-07-04 18:03:57 +08:00 |
|
钱涛
|
91859e5127
|
Merge branch 'feature/230701非系统算税' into release/2.9.1.2307.01
|
2023-07-04 15:38:55 +08:00 |
|
sy
|
0e8aa4995d
|
Merge remote-tracking branch 'remotes/origin/fix/importTemplateRemarkRepair' into release/2.9.1.2307.01
|
2023-07-04 14:51:07 +08:00 |
|
sy
|
7f7e7cd453
|
薪酬系统-薪资档案，导入模板字段提示位置问题修复
|
2023-07-04 14:48:02 +08:00 |
|
Harryxzy
|
a5a05aabda
|
工资单定时发送fix
|
2023-07-04 14:35:51 +08:00 |
|
Harryxzy
|
c8cf6090ff
|
系统薪资项目可配置删除、工资单模板默认没有隐藏项目
|
2023-07-04 13:21:19 +08:00 |
|
钱涛
|
82ab6c1e11
|
非系统算税功能
|
2023-07-04 09:32:12 +08:00 |
|
Harryxzy
|
8dc3883168
|
工资单定时发送
|
2023-07-03 17:46:11 +08:00 |
|
钱涛
|
a37d6758bb
|
核算状态标识
|
2023-07-03 14:27:20 +08:00 |
|
钱涛
|
1403b22cf7
|
修复邮件保存
|
2023-07-03 14:02:34 +08:00 |
|
Harryxzy
|
11c416601d
|
工资单定时发送渲染bug
|
2023-07-03 11:21:49 +08:00 |
|
Harryxzy
|
5e4f32dbab
|
累计专项附加扣除更新插入时间修正
|
2023-07-03 10:34:30 +08:00 |
|
Harryxzy
|
2bf99d3ec1
|
累计专项附加扣除防抖动修复
|
2023-07-03 10:33:01 +08:00 |
|
Harryxzy
|
faa2b9c16e
|
工资单模板信息
|
2023-07-03 09:44:10 +08:00 |
|
Harryxzy
|
18fb376054
|
个税申报撤回fix
|
2023-06-30 16:41:06 +08:00 |
|
Harryxzy
|
9842784297
|
工资单定时发送 - 模板保存
|
2023-06-30 15:58:55 +08:00 |
|
Harryxzy
|
8cbc758131
|
删除档案开关bug
|
2023-06-30 11:40:59 +08:00 |
|
Harryxzy
|
1fa04f1515
|
个税申报撤回开关-2
|
2023-06-29 16:42:48 +08:00 |
|
Harryxzy
|
04592a58b4
|
Merge branch 'release/2.8.4.2306.02' into feature/taxDeclarationWithdraw
# Conflicts:
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/web/SalarySystemConfigController.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-06-29 16:40:07 +08:00 |
|
Harryxzy
|
ba85231656
|
个税申报撤回开关-1
|
2023-06-29 16:38:50 +08:00 |
|
Harryxzy
|
d10d5da364
|
Merge remote-tracking branch 'origin/release/2.8.4.2306.02' into release/2.8.4.2306.02
|
2023-06-29 15:14:10 +08:00 |
|
sy
|
a429c271f4
|
Merge branch 'feature/230602-数据库适配-PG' into release/2.8.4.2306.02
|
2023-06-29 15:12:48 +08:00 |
|
Harryxzy
|
eb0c59c0b9
|
累计专项附加扣除列表提速-2
|
2023-06-29 14:05:33 +08:00 |
|
Harryxzy
|
33593311df
|
累计专项附加扣除列表提速
|
2023-06-29 14:04:11 +08:00 |
|
Harryxzy
|
e3e0bcd66b
|
累计专项附加扣除防抖动
|
2023-06-29 13:53:07 +08:00 |
|
钱涛
|
6a5304a605
|
修复进度条
|
2023-06-29 13:38:07 +08:00 |
|
Harryxzy
|
2735661b4a
|
删除薪资档案
|
2023-06-29 10:35:55 +08:00 |
|
钱涛
|
b130fb0121
|
海康包冲突jar
|
2023-06-28 18:11:53 +08:00 |
|
Harryxzy
|
5d83326d23
|
listByAcctEmployeeIdsAndSalaryItemIds的分片问题
|
2023-06-28 16:26:20 +08:00 |
|
sy
|
faee7160e3
|
Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG
|
2023-06-28 09:46:11 +08:00 |
|
Harryxzy
|
2bb5d18b90
|
Merge branch 'fix/薪资核算页面查看权限校验' into release/2.8.4.2306.02
|
2023-06-28 09:16:51 +08:00 |
|
Harryxzy
|
ea527d0e37
|
Merge branch 'fix/下载档案模板没有数据' into release/2.8.4.2306.02
|
2023-06-27 18:00:59 +08:00 |
|
Harryxzy
|
04f0528143
|
修复下载薪资档案模板没有带出档案数据
|
2023-06-27 18:00:39 +08:00 |
|
钱涛
|
89ae0dc786
|
报表缓存时参数变更问题
|
2023-06-27 16:18:42 +08:00 |
|
sy
|
041303275b
|
Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG
|
2023-06-27 15:09:12 +08:00 |
|
sy
|
d65a792076
|
Merge remote-tracking branch 'remotes/origin/release/2.8.4.2306.02' into feature/230602-数据库适配-PG
|
2023-06-27 15:05:22 +08:00 |
|
sy
|
1ed02f4d07
|
薪酬系统-福利台账，(修改台账列表返回台账状态值返回逻辑)——暂时取消
|
2023-06-27 15:05:07 +08:00 |
|
Harryxzy
|
822ad87451
|
薪资核算结果校验拦截
|
2023-06-27 14:58:33 +08:00 |
|
Harryxzy
|
6ae98ce50a
|
Merge branch 'fix/新建定量维度时数据透视没有值' into release/2.8.4.2306.02
|
2023-06-26 14:23:27 +08:00 |
|
钱涛
|
6f3593f44b
|
Merge branch 'feature/短信验证码' into release/2.8.4.2306.02
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
|
2023-06-26 13:54:56 +08:00 |
|
Harryxzy
|
ca248ded98
|
发送邮件修复bug
|
2023-06-26 13:32:14 +08:00 |
|
Harryxzy
|
7c44a2ad6b
|
Merge branch 'feature/waterMark' into release/2.8.4.2306.02
# Conflicts:
# src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
# src/com/engine/salary/web/SalaryBillController.java
|
2023-06-26 13:28:21 +08:00 |
|
Harryxzy
|
ce6ba1453c
|
Merge branch 'fix/一键累计定时任务' into release/2.8.4.2306.02
|
2023-06-26 13:27:21 +08:00 |
|
Harryxzy
|
0d23a318e8
|
Merge branch 'feature/停薪action' into release/2.8.4.2306.02
|
2023-06-26 13:27:03 +08:00 |
|
Harryxzy
|
a43123efc0
|
Merge branch 'fix/DBType修改' into release/2.8.4.2306.02
|
2023-06-26 13:26:27 +08:00 |
|
Harryxzy
|
3be6eaa16f
|
Merge branch 'feature/核算人员匹配规则（是否包含停薪列）' into release/2.8.4.2306.02
|
2023-06-26 13:26:03 +08:00 |
|
Harryxzy
|
0117624dc4
|
Merge branch 'fix/回算后无法发放第二次工资单' into release/2.8.4.2306.02
|
2023-06-26 13:25:36 +08:00 |