 钱涛
|
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 |
|
MustangDeng
|
224c823590
|
oracle 自增返回
|
2022-05-27 15:01:44 +08:00 |
|
钱涛
|
3dfe647a76
|
新增字段
|
2022-05-27 15:00:53 +08:00 |
|
钱涛
|
be4ed2229d
|
暂存
|
2022-05-27 14:51:53 +08:00 |
|
钱涛
|
c4c04ac87a
|
暂存
|
2022-05-27 14:46:01 +08:00 |
|
MustangDeng
|
6ad9e30bca
|
oracle 原始脚本
|
2022-05-27 14:11:13 +08:00 |
|
钱涛
|
ad991954cd
|
暂存
|
2022-05-27 11:49:23 +08:00 |
|
MustangDeng
|
87ede8cafa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-27 09:57:54 +08:00 |
|
MustangDeng
|
76fd0e68cf
|
oracle 原始脚本
|
2022-05-27 09:57:44 +08:00 |
|
钱涛
|
d776220cae
|
fix
|
2022-05-27 09:33:40 +08:00 |
|
钱涛
|
b5d6adfbde
|
暂存
|
2022-05-26 18:16:48 +08:00 |
|
MustangDeng
|
79b37540f9
|
oracle 原始脚本修改
|
2022-05-26 17:59:56 +08:00 |
|
MustangDeng
|
fa92ddddf5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-26 15:48:13 +08:00 |
|
MustangDeng
|
38c31a7e79
|
oracle 脚本修改
|
2022-05-26 15:48:00 +08:00 |
|
钱涛
|
c6ea4c5698
|
线下对比
|
2022-05-26 15:45:37 +08:00 |
|
MustangDeng
|
28eea0d594
|
oracle 脚本字段修改
|
2022-05-26 14:24:03 +08:00 |
|
MustangDeng
|
a77bb4c508
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-26 14:07:37 +08:00 |
|
MustangDeng
|
a139c184c9
|
oracle 脚本
|
2022-05-26 14:07:26 +08:00 |
|
钱涛
|
cf5e914318
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-26 13:42:44 +08:00 |
|
钱涛
|
6103c9233e
|
批量操作数量限制
|
2022-05-26 13:41:58 +08:00 |
|
MustangDeng
|
968a48eed2
|
取消福利归档前异常数据校验
|
2022-05-26 13:30:23 +08:00 |
|
钱涛
|
f6eb69e62a
|
暂存
|
2022-05-26 11:02:55 +08:00 |
|
MustangDeng
|
615bb51a59
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-26 11:00:58 +08:00 |