Commit Graph

16 Commits

Author SHA1 Message Date
sy 438b86e2e1 Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/salary_i18
# Conflicts:
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/biz/SICategoryBiz.java
#	src/com/engine/salary/entity/salaryBill/param/SalaryBaseSetSaveParam.java
#	src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
#	src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
#	src/com/engine/salary/enums/salaryarchive/SalaryArchiveListTypeEnum.java
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
#	src/com/engine/salary/web/SalaryArchiveController.java
#	src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
#	src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
2023-07-28 11:13:09 +08:00
sy 74b8726d7a 薪酬系统-多语言,翻译部分中文表述 2023-07-20 15:57:35 +08:00
Harryxzy 1ea80b8fe9 工资单反馈 2023-07-17 15:01:14 +08:00
Harryxzy 56c1666542 工资单发放 2023-07-11 17:51:52 +08:00
Harryxzy be895829c2 工资单反馈 2023-07-11 15:29:13 +08:00
sy bc346bff6e 薪酬系统-多语言,合并最新master改动,并处理冲突 2023-06-30 18:03:34 +08:00
Harryxzy f4b3a742f0 系统默认水印 2023-06-16 09:58:54 +08:00
Harryxzy 7a40a31d6f 水印 - 暂存2 2023-06-12 15:19:24 +08:00
钱涛 3498005a11 工资单发放 2023-06-07 14:21:47 +08:00
钱涛 f154753698 拦截短信 2023-06-06 15:02:53 +08:00
钱涛 a308ee8d1f 获取员工短信内容 2023-06-06 14:21:35 +08:00
钱涛 0e5eb1b11e 工资单发送 2023-06-06 11:48:19 +08:00
钱涛 4582ab1e51 邮件审批方法 2023-06-06 09:51:07 +08:00
钱涛 91e3b335dd 工资单通道 2023-06-05 13:35:17 +08:00
钱涛 0da2bfa55a 邮件暂存 2023-06-02 14:38:56 +08:00
钱涛 8228fbf21c 短信邮件 2023-05-08 09:27:20 +08:00