Commit Graph

85 Commits

Author SHA1 Message Date
钱涛 fcf5a778c3 钱智,社保报表 2025-12-08 16:59:54 +08:00
钱涛 59720d9340 钱智版本 2025-12-04 17:15:13 +08:00
钱涛 55238f1dfe 钱智,需求 2025-11-28 13:27:32 +08:00
钱涛 dcd37b9ad3 钱智,版本 2025-11-21 14:04:44 +08:00
钱涛 e1106de20c Merge branch 'release/3.0.2.2504.01' into custom/钱智 2025-10-29 09:43:24 +08:00
钱涛 0adfa422a4 版本 2025-10-13 13:47:55 +08:00
钱涛 9830b156a5 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-07-07 10:21:09 +08:00
钱涛 8168a42b61 日志 2025-07-07 10:20:53 +08:00
钱涛 b55ea81e4e 日志 2025-07-07 10:20:24 +08:00
钱涛 53c8909de4 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-06-25 14:37:22 +08:00
钱涛 45acec8468 上线版本 2025-06-19 14:40:09 +08:00
钱涛 603d31b095 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-05-09 16:28:56 +08:00
钱涛 ac1a767a29 版本 2025-05-09 10:19:58 +08:00
钱涛 1a66a1f846 版本 2025-04-29 16:07:51 +08:00
钱涛 110cec1b33 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-21 14:27:00 +08:00
钱涛 4d56cde7a9 版本 2025-04-17 15:34:29 +08:00
钱涛 47ba860cc6 Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-08 16:39:27 +08:00
钱涛 97546393a4 上线版本 2025-03-27 16:31:40 +08:00
钱涛 8a49a2ef1b 上线版本 2025-03-27 16:13:19 +08:00
钱涛 e25c1f59d2 人员报送,业务线功能 2025-03-27 09:51:44 +08:00
钱涛 93defb41cd 版本 2025-03-20 17:32:06 +08:00
钱涛 93b98ce583 版本 2025-02-20 10:54:52 +08:00
钱涛 50c3bbf41d Merge branch 'release/2.19.1.2501.01' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
2025-01-21 17:14:47 +08:00
钱涛 5a0ef67816 版本 2025-01-03 09:14:08 +08:00
钱涛 8f697eba36 版本 2025-01-02 15:00:21 +08:00
钱涛 35aff0431e Merge branch 'release/2.18.2.2412.02' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2024-12-27 09:24:22 +08:00
钱涛 b3dcafa6f1 版本号 2024-12-09 15:12:33 +08:00
钱涛 2fe7b7dc03 Merge branch 'release/2.17.1.2411.01' into feature/数据推送 2024-11-20 18:43:59 +08:00
钱涛 ba3e635e1f 版本 2024-11-19 11:12:39 +08:00
钱涛 909782d7d6 调薪管理页面权限 2024-10-31 10:46:02 +08:00
钱涛 c3e7037667 Merge branch 'release/2.16.1.2410.01' into feature/权限 2024-10-25 09:34:45 +08:00
钱涛 28fa294c6f 异步记录日志 2024-10-24 10:19:35 +08:00
钱涛 5271d2516a Merge branch 'release/2.16.1.2410.01' into feature/权限
# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
2024-10-22 09:27:11 +08:00
钱涛 cede931b0d 版本 2024-10-17 14:21:46 +08:00
钱涛 63c6a5af5e 业务线配置 2024-09-24 19:02:40 +08:00
钱涛 7584404bc1 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-20 10:27:42 +08:00
钱涛 ee535fc2bf 1、业务线-新建累计专项附加扣除
2、业务线-报表
2024-09-19 16:46:36 +08:00
钱涛 db064863b2 版本号 2024-09-19 14:19:26 +08:00
钱涛 6e7ccb2339 浮动薪资档案分权 2024-09-18 18:19:58 +08:00
钱涛 de0728665b 导入往期累计 2024-09-13 17:32:15 +08:00
钱涛 e8b2fec1ff Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-12 15:03:19 +08:00
钱涛 8aa34b806c 日志权限 2024-09-12 14:50:10 +08:00
钱涛 c7659e0717 数据采集权限 2024-09-11 10:28:20 +08:00
钱涛 a0fb036bce 业务线配置 2024-09-09 19:10:40 +08:00
钱涛 17afe87356 申报表权限规则 2024-09-05 18:14:02 +08:00
钱涛 5ccee97429 新建账套携带各扣缴义务人人员范围 2024-09-04 13:59:00 +08:00
钱涛 3721867723 核算和账套的权限 2024-08-28 17:55:42 +08:00
钱涛 9b96d0cff2 限制账套 2024-08-28 10:02:39 +08:00
钱涛 36c325c62d sql权限 2024-08-23 09:38:54 +08:00
钱涛 a22aa624db 权限控制 2024-08-22 15:37:50 +08:00