Commit Graph

282 Commits

Author SHA1 Message Date
钱涛 fed88b5ac5 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-24 19:05:21 +08:00
钱涛 6f10ac4ab2 取消非系统人员菜单 2024-09-24 19:04:57 +08:00
钱涛 63c6a5af5e 业务线配置 2024-09-24 19:02:40 +08:00
钱涛 a40814fa0b 业务线sql 2024-09-24 14:37:46 +08:00
钱涛 ae708a1d3b Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-24 13:19:59 +08:00
钱涛 17ef5a3c2b 浮动数据菜单 2024-09-24 13:19:20 +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
钱涛 96ced6e934 Merge branch 'release/2.15.2.2409.01' into feature/权限 2024-09-13 17:32:58 +08:00
钱涛 de0728665b 导入往期累计 2024-09-13 17:32:15 +08:00
Harryxzy 9e5810f173 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-13 11:11:24 +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
钱涛 1dd8f12534 Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
#	resource/wiki/扩展功能/hrmSalaryCustom.properties
2024-09-09 14:20:56 +08:00
钱涛 17afe87356 申报表权限规则 2024-09-05 18:14:02 +08:00
钱涛 5ccee97429 新建账套携带各扣缴义务人人员范围 2024-09-04 13:59:00 +08:00
钱涛 b7f9a1653c 线程数量 2024-09-02 17:41:07 +08:00
钱涛 ecfa6a4604 跨扣缴义务人核算 2024-09-02 17:36:41 +08:00
钱涛 13665d8269 业务线列表 2024-09-02 10:43:28 +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
钱涛 25321bb357 Merge branch 'release/2.15.1.2407.01' into feature/权限 2024-08-21 15:49:12 +08:00
钱涛 ae3d666e7d 核算和申报权限 2024-08-20 11:40:12 +08:00
钱涛 a796752203 Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
#	src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
2024-08-19 10:43:43 +08:00
钱涛 659560550a Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 13:18:08 +08:00
钱涛 5071c08d8c Merge branch 'release/2.15.1.2407.01' into feature/导入工具
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
2024-08-15 13:41:52 +08:00
钱涛 f74ec99644 账套支持sql范围 2024-08-15 10:37:41 +08:00
Harryxzy 1ebc56bb70 浮动薪酬增加义务人sql 2024-08-12 16:49:29 +08:00
钱涛 b83d45efa0 下载系统配置 2024-08-12 10:02:46 +08:00
Harryxzy 75fb15928a 浮动薪酬 2024-08-09 10:21:40 +08:00
钱涛 4d8c54bf8a 角色加描述 2024-08-02 16:18:26 +08:00
钱涛 494679087d 角色加描述 2024-08-02 14:04:14 +08:00
钱涛 a0d2db2702 角色 2024-08-01 16:19:23 +08:00
钱涛 c674c22da1 在线算税重试处理 2024-08-01 10:56:29 +08:00
钱涛 63012fd62a 成员列表 2024-07-29 13:28:46 +08:00
钱涛 a976dbc9c5 成员同步 2024-07-29 09:46:01 +08:00
钱涛 4543539206 角色和成员基础接口 2024-07-26 11:35:17 +08:00
钱涛 b91818f2dc 版本 2024-07-15 09:36:40 +08:00
钱涛 993f21b448 Merge branch 'feature/人员信息快照' into release/2.14.5.2406.03
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2024-06-21 14:17:36 +08:00
钱涛 6d3af9d4ed wiki 2024-06-21 14:14:57 +08:00
钱涛 28536476d3 版本 2024-06-21 09:16:44 +08:00
钱涛 8d65e5d501 版本记录 2024-06-20 14:48:35 +08:00
钱涛 fa26d3041a 默认算税sql 2024-06-20 11:08:52 +08:00
钱涛 0c0c754a9d 人员信息快照 2024-06-18 11:01:58 +08:00