Commit Graph

18 Commits

Author SHA1 Message Date
钱涛 5d3e2928c9 Merge branch 'release/2.9.6.2310.01' into release/个税版本 2023-10-13 16:54:46 +08:00
Harryxzy 8e8a502738 prop 2023-10-12 14:26:28 +08:00
钱涛 26bbc9c0ee Merge branch 'release/2.9.6.2310.01' into release/个税版本
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
2023-10-08 14:21:25 +08:00
钱涛 5602d65ed8 Merge branch 'release/2.9.5.2309.01' into release/个税版本
# Conflicts:
#	resource/WEB-INF/prop/hrmSalaryCustom.properties
2023-09-22 17:59:06 +08:00
钱涛 7c5af2166e 日期格式自定义配置 2023-09-22 17:57:47 +08:00
钱涛 12480f8306 生成工资单pdf签名 2023-09-18 18:45:59 +08:00
钱涛 6871316f98 Merge branch 'release/2.9.4.2308.02' into release/个税一期
# Conflicts:
#	resource/WEB-INF/prop/hrmSalaryCustom.properties
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
2023-09-04 09:30:24 +08:00
钱涛 0ac2fd248e 慢sql提醒 2023-08-31 16:22:02 +08:00
钱涛 283485929f 超时提醒 2023-08-31 15:31:34 +08:00
钱涛 f7f1a85441 流量不足提醒 2023-08-31 10:34:26 +08:00
钱涛 3e8ac01049 公式描述 2023-05-04 18:07:35 +08:00
钱涛 31a075cee5 删除配置 2023-01-06 14:40:23 +08:00
钱涛 c71b73799a 取消插件 2022-12-14 15:02:22 +08:00
钱涛 389022e0ea 配置文件 2022-12-09 10:12:25 +08:00
钱涛 479bc2d39a 出包材料 2022-05-19 14:50:57 +08:00
钱涛 bdf3a422d6 配置文件GBK编码 2022-05-11 09:26:49 +08:00
钱涛 5c2bb1bf58 入职日期改为String 2022-04-28 10:05:27 +08:00
钱涛 11241d0b6f 权限构造 2022-04-26 11:26:13 +08:00