Commit Graph

24 Commits

Author SHA1 Message Date
钱涛 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
钱涛 5ef4c8c909 解决sql202307100103.sql与组织冲突 2023-09-01 11:33:20 +08:00
sy cd5e5d2284 薪酬系统-ST数据库适配,神通数据库-薪酬非标初始化脚本 2023-08-31 14:04:41 +08:00
钱涛 b5f9477c90 流量监控 2023-08-28 13:31:11 +08:00
钱涛 1cd07d7986 去除为空校验 2023-08-24 16:49:53 +08:00
钱涛 4ea735a731 个税标签和菜单 2023-08-24 16:29:13 +08:00
钱涛 45e69cd6c8 导出 2023-08-24 11:36:17 +08:00
钱涛 7e7615bf4a 账套薪资项目添加code 2023-08-23 16:20:45 +08:00
钱涛 988139610b Merge branch 'release/2.9.4.2308.02' into release/230803对接个税
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/web/SalarySobController.java
2023-08-18 09:36:26 +08:00
钱涛 914963135a 个税对接辅助缴款 2023-08-17 14:55:32 +08:00
钱涛 414f960346 账套-个税字段对应、累计字段对应 2023-08-17 09:22:09 +08:00
钱涛 3004394e96 账套-个税字段对应、累计字段对应 2023-08-15 20:50:47 +08:00
钱涛 cf22685fca 账套-个税字段对应、累计字段对应 2023-08-15 20:48:09 +08:00
钱涛 090b100784 个税对接,个税申报接口 2023-08-14 20:29:19 +08:00
钱涛 b1817142b0 个税对接,个税申报接口 2023-08-14 20:07:29 +08:00
钱涛 dc63897165 个税对接,个税申报接口 2023-08-11 14:20:14 +08:00
钱涛 50658012a1 个税对接,个税申报接口 2023-08-10 09:33:04 +08:00
钱涛 615813c478 个税对接,人员报送相关接口 2023-08-09 18:35:09 +08:00
sy 6f9deed908 薪酬系统-福利档案,修改社保、公积金、其他福利表结构 2023-08-09 18:19:42 +08:00
钱涛 e75d5ab427 v1 2023-07-20 10:36:29 +08:00
钱涛 5d6a471fb8 删除未适配数据库 2023-07-17 14:37:15 +08:00
钱涛 1b289319a4 工资单反馈sql 2023-07-17 11:52:10 +08:00
钱涛 aa8f46e84f 删除sql,修改签名 2023-05-05 14:08:37 +08:00
钱涛 b30a58c1d9 报表功能 2023-04-07 14:38:38 +08:00