MustangDeng
|
68994ee304
|
Merge branch 'develop' into feature/encrypt
# Conflicts:
# resource/ecology9/WEB-INF/prop/hrmSalary.properties
# src/com/engine/salary/biz/AddUpDeductionBiz.java
# src/com/engine/salary/biz/AddUpSituationBiz.java
# src/com/engine/salary/biz/OtherDeductionBiz.java
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2022-05-31 11:33:36 +08:00 |
 钱涛
|
76b05e3d38
|
fix
|
2022-05-31 09:59:32 +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
|
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 |
|
MustangDeng
|
597e2206e9
|
like 修改
|
2022-05-30 13:43:28 +08:00 |
|
钱涛
|
6470346ed0
|
oracle的like
|
2022-05-30 13:30:51 +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 |
|
MustangDeng
|
224c823590
|
oracle 自增返回
|
2022-05-27 15:01:44 +08:00 |
|
钱涛
|
d776220cae
|
fix
|
2022-05-27 09:33:40 +08:00 |
|
钱涛
|
c6ea4c5698
|
线下对比
|
2022-05-26 15:45:37 +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 |
|
MustangDeng
|
615bb51a59
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-26 11:00:58 +08:00 |
|
MustangDeng
|
05dc46894d
|
总览数据不对问题
|
2022-05-26 11:00:38 +08:00 |
|
钱涛
|
8e2e420d6a
|
处理sqlserver参数过多异常
|
2022-05-25 17:15:16 +08:00 |
|
MustangDeng
|
5abd648e9b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-25 13:23:15 +08:00 |
|
MustangDeng
|
402a3304cc
|
福利核算数据量过大的情况
|
2022-05-25 13:23:02 +08:00 |
|
钱涛
|
f066d1ef64
|
fix档案分页
|
2022-05-25 13:13:03 +08:00 |
|
钱涛
|
99fda7ecc3
|
修复调薪记录
|
2022-05-25 11:09:48 +08:00 |
|
MustangDeng
|
5cd4e46b8a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-24 13:42:25 +08:00 |
|
MustangDeng
|
fe1cb27004
|
修复 自定义福利中已经停用某项福利，但新增方案时候还能引用
|
2022-05-24 13:42:15 +08:00 |
|
钱涛
|
f555192e70
|
升级
|
2022-05-24 11:24:21 +08:00 |
|
钱涛
|
705f10f153
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-24 10:54:58 +08:00 |
|
钱涛
|
bccd246b2c
|
fix分页异常
|
2022-05-24 10:54:46 +08:00 |
|
MustangDeng
|
78234f7554
|
工资单默认模板
|
2022-05-24 10:24:17 +08:00 |
|
MustangDeng
|
05f529769c
|
加解密
|
2022-05-24 09:23:17 +08:00 |
|
MustangDeng
|
46a0b77611
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-23 13:39:08 +08:00 |
|
MustangDeng
|
5f2c20eaec
|
默认不启用非标功能
|
2022-05-23 13:38:48 +08:00 |
|
钱涛
|
d77e8b0de4
|
累计扣除字段
|
2022-05-20 14:41:42 +08:00 |
|
MustangDeng
|
6b9200121e
|
福利台账归档
|
2022-05-19 16:32:33 +08:00 |
|
MustangDeng
|
1f636c28d6
|
福利台账异动清单
|
2022-05-19 11:23:25 +08:00 |
|
MustangDeng
|
6024a69e84
|
福利档案导出
|
2022-05-19 10:20:23 +08:00 |
|
MustangDeng
|
0909e37741
|
数据采集高级搜索
|
2022-05-19 09:45:02 +08:00 |
|
MustangDeng
|
69246485ee
|
福利导入模板
|
2022-05-19 09:33:07 +08:00 |
|
MustangDeng
|
f8105537c9
|
福利导入
|
2022-05-18 18:53:30 +08:00 |
|
MustangDeng
|
14daede3d0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-18 16:37:34 +08:00 |
|
MustangDeng
|
fcbc6c7202
|
福利方案分页创建
|
2022-05-18 16:37:23 +08:00 |
|
钱涛
|
647d4ae28b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-18 16:08:13 +08:00 |
|
钱涛
|
bb66f80906
|
fix 新增系统薪资项目，模糊搜索
|
2022-05-18 16:07:51 +08:00 |
|
MustangDeng
|
51e5649dd8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-05-18 14:36:46 +08:00 |
|
MustangDeng
|
604d3d453e
|
福利方案判断重复
|
2022-05-18 14:36:37 +08:00 |
|
钱涛
|
dc1c865a4b
|
账套项目删除bug
|
2022-05-18 14:34:06 +08:00 |