 钱涛
|
bb665500ae
|
档案
|
2022-06-01 19:14:05 +08:00 |
|
钱涛
|
37a73b94df
|
同步人员
|
2022-06-01 17:45:49 +08:00 |
|
钱涛
|
e66c86d32c
|
fix
|
2022-06-01 15:18:10 +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 |
|
钱涛
|
8b14038b90
|
分权
|
2022-05-31 09:58:35 +08:00 |
|
钱涛
|
5925fb5606
|
分权
|
2022-05-30 20:13:03 +08:00 |
|
钱涛
|
e38841f280
|
合并auth
|
2022-05-30 18:59:48 +08:00 |
|
钱涛
|
f8ecb548ed
|
Merge branch 'auth' into release
# Conflicts:
# src/com/engine/salary/biz/AddUpDeductionBiz.java
# src/com/engine/salary/biz/AddUpSituationBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/biz/SalaryArchiveBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/biz/SalaryItemBiz.java
# src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
# src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java
# src/com/engine/salary/cmd/datacollection/AddUpSituationImportCmd.java
# src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
# src/com/engine/salary/enums/UserStatusEnum.java
# src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
# src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
|
2022-05-30 18:50:00 +08:00 |
|
钱涛
|
25991fe675
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-30 18:03:36 +08:00 |
|
钱涛
|
3907ac49d9
|
fix bug
|
2022-05-30 18:03:20 +08:00 |
MustangDeng
|
6ee93fdeea
|
默认不开启非标
|
2022-05-30 17:35:40 +08:00 |
|
MustangDeng
|
e0e19d616e
|
oracle脚本调整位置
|
2022-05-30 17:34:53 +08:00 |
|
MustangDeng
|
0af5199d9b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-30 17:31:40 +08:00 |
|
MustangDeng
|
4e4c190f31
|
bug修改
|
2022-05-30 17:31:29 +08:00 |
|
钱涛
|
c7a4f8a8e1
|
档案导入提示优化
|
2022-05-30 16:25:27 +08:00 |
|
钱涛
|
bccda4c7a3
|
sql
|
2022-05-30 14:46:52 +08:00 |
|
钱涛
|
6986b39231
|
暂存
|
2022-05-30 14:17:02 +08:00 |
|
钱涛
|
843db8db35
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-30 13:47:38 +08:00 |
|
钱涛
|
2c1d1a31dc
|
sql
|
2022-05-30 13:47:31 +08:00 |
|
MustangDeng
|
597e2206e9
|
like 修改
|
2022-05-30 13:43:28 +08:00 |
|
钱涛
|
7e09b283da
|
暂存
|
2022-05-30 13:33:22 +08:00 |
|
钱涛
|
5bc26b79f9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-30 13:31:01 +08:00 |
|
钱涛
|
6470346ed0
|
oracle的like
|
2022-05-30 13:30:51 +08:00 |
|
MustangDeng
|
5fe3b59ad5
|
oracle sql修改
|
2022-05-30 12:10:07 +08:00 |
|
MustangDeng
|
b80f31c6f8
|
oracle sql修改
|
2022-05-30 12:08:14 +08:00 |
|
MustangDeng
|
1ccb2b94b2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-30 11:53:01 +08:00 |
|
MustangDeng
|
bc590ef10d
|
oracle sql修改
|
2022-05-30 11:52:46 +08:00 |
|
钱涛
|
4baa1643f6
|
oracle适配
|
2022-05-30 11:51:00 +08:00 |
|
MustangDeng
|
bd7c3e45a5
|
台账核算
|
2022-05-30 11:27:39 +08:00 |
|
MustangDeng
|
2ccc30db96
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-30 09:14:33 +08:00 |
|
MustangDeng
|
d48ef0aeec
|
oracle 适配
|
2022-05-30 09:14:12 +08:00 |
|
钱涛
|
60ae1ff35b
|
sqlserver
适配
|
2022-05-27 18:07:26 +08:00 |
|
钱涛
|
841ca27c84
|
暂存
|
2022-05-27 17:21:39 +08:00 |
|
钱涛
|
71ea4b8609
|
导入
|
2022-05-27 15:43:38 +08:00 |
|
MustangDeng
|
df92c102e2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-27 15:01:56 +08:00 |