 钱涛
|
d09856c390
|
人员范围保存校验
|
2022-06-10 14:21:21 +08:00 |
|
钱涛
|
382620c589
|
申报表
|
2022-06-09 19:02:18 +08:00 |
|
钱涛
|
b8972bcd43
|
分权v3
|
2022-06-09 17:45:28 +08:00 |
|
钱涛
|
7f8d317846
|
冲突
|
2022-06-08 18:53:30 +08:00 |
|
钱涛
|
b832910af9
|
Merge branch 'develop' into release
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2022-06-08 18:48:23 +08:00 |
|
钱涛
|
61346f139b
|
申报和往期异常
|
2022-06-08 17:59:30 +08:00 |
MustangDeng
|
1f7de7bc90
|
fix bug
|
2022-06-08 17:55:14 +08:00 |
|
钱涛
|
860c89b560
|
申报和往期异常
|
2022-06-08 16:36:50 +08:00 |
|
钱涛
|
d765ede418
|
默认关闭
|
2022-06-07 19:22:46 +08:00 |
|
钱涛
|
79632dd1bf
|
申报表分权
|
2022-06-07 19:10:40 +08:00 |
|
钱涛
|
cedc9f2644
|
考勤和申报表的分权
|
2022-06-07 15:43:22 +08:00 |
|
钱涛
|
38557e2e03
|
去除自增
|
2022-06-07 13:24:20 +08:00 |
|
钱涛
|
b20a6e4cbf
|
去重
|
2022-06-06 19:24:49 +08:00 |
|
钱涛
|
dc27578ddf
|
社保福利分权1.0
|
2022-06-06 16:55:02 +08:00 |
|
MustangDeng
|
3a1ac7ca93
|
工资单部分分页调整
|
2022-06-06 11:43:46 +08:00 |
|
MustangDeng
|
ddc4edd918
|
档案高级搜索
|
2022-06-06 11:28:18 +08:00 |
|
钱涛
|
88a0d08b1f
|
Merge branch 'auth-2' into release
# Conflicts:
# src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
|
2022-06-06 10:37:07 +08:00 |
|
钱涛
|
0ed51f8cf9
|
处理合并dev冲突
|
2022-06-06 10:26:31 +08:00 |
|
钱涛
|
2bfd6c90a0
|
Merge branch 'develop' into release
# Conflicts:
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
|
2022-06-06 10:23:19 +08:00 |
|
钱涛
|
3f0bbd3160
|
剔除主账号
|
2022-06-06 10:19:11 +08:00 |
|
钱涛
|
6646a2e481
|
申报表的分权
|
2022-06-02 18:02:27 +08:00 |
|
钱涛
|
be88b90f56
|
核算的分权
|
2022-06-02 17:10:54 +08:00 |
|
MustangDeng
|
c55cd2d85d
|
工资单详情高级搜索样式优化
|
2022-06-02 10:34:24 +08:00 |
|
钱涛
|
a69bd42b49
|
核算的分权
|
2022-06-01 21:21:07 +08:00 |
|
钱涛
|
77645074c5
|
核算的分权
|
2022-06-01 21:15:48 +08:00 |
|
钱涛
|
758e64e6bc
|
档案导入
|
2022-06-01 20:46:51 +08:00 |
|
钱涛
|
bb665500ae
|
档案
|
2022-06-01 19:14:05 +08:00 |
|
MustangDeng
|
1cfa182acd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-06-01 19:13:35 +08:00 |
|
MustangDeng
|
da2a0e5d22
|
工资单及福利问题修复
|
2022-06-01 19:13:20 +08:00 |
|
钱涛
|
37a73b94df
|
同步人员
|
2022-06-01 17:45:49 +08:00 |
|
钱涛
|
364bf58bda
|
fix
|
2022-06-01 15:59:56 +08:00 |
|
钱涛
|
e6da6a3ff1
|
fix
|
2022-06-01 15:52:37 +08:00 |
|
钱涛
|
e66c86d32c
|
fix
|
2022-06-01 15:18:10 +08:00 |
|
MustangDeng
|
4430d50492
|
工资单及福利问题修复
|
2022-06-01 14:53:16 +08:00 |
|
钱涛
|
7ffc241b0a
|
管理
|
2022-05-31 21:48:00 +08:00 |
|
钱涛
|
084b1e1a99
|
fix管理员异常
|
2022-05-31 21:15:33 +08:00 |
|
钱涛
|
efd31013cd
|
薪资账套分权
|
2022-05-31 21:05:59 +08:00 |
|
钱涛
|
5596d88c6f
|
adminUser->AdminUserIds
|
2022-05-31 20:12:25 +08:00 |
|
钱涛
|
7633a06636
|
Merge branch 'develop' into release
|
2022-05-31 20:07:33 +08:00 |
|
钱涛
|
2c71590c98
|
暂存
|
2022-05-31 19:29:45 +08:00 |
|
钱涛
|
69c76ea687
|
Merge branch 'auth-1' into release
|
2022-05-31 18:29:43 +08:00 |
|
钱涛
|
d800ab1925
|
Merge branch 'develop' into release
|
2022-05-31 18:29:34 +08:00 |
|
钱涛
|
3f958d2886
|
暂存
|
2022-05-31 18:27:33 +08:00 |
|
钱涛
|
99b5c36864
|
暂存
|
2022-05-31 16:41:11 +08:00 |
|
钱涛
|
3471783d65
|
薪酬还原脚本
|
2022-05-31 13:53:57 +08:00 |
|
钱涛
|
45c3f91145
|
其他扣除
|
2022-05-31 11:43:45 +08:00 |
|
钱涛
|
019ad96871
|
其他扣除
|
2022-05-31 11:21:51 +08:00 |
|
钱涛
|
72d1b48126
|
fix
|
2022-05-31 11:03:56 +08:00 |
|
钱涛
|
0898055d77
|
fix
|
2022-05-31 10:29:18 +08:00 |
|
钱涛
|
76b05e3d38
|
fix
|
2022-05-31 09:59:32 +08:00 |