Commit Graph

25 Commits

Author SHA1 Message Date
钱涛 673699dfb8 导入工具明细 2024-08-16 11:18:27 +08:00
钱涛 b83d45efa0 下载系统配置 2024-08-12 10:02:46 +08:00
钱涛 83a408afa2 迁移工具 2024-08-08 16:53:31 +08:00
Harryxzy 467746f7df Merge branch 'release/2.9.1.2307.01' into feature/230701-工资单反馈 2023-07-10 11:12:03 +08:00
Harryxzy 584ebbc562 暂存 2023-07-10 11:11:52 +08:00
Harryxzy 0e2a6c8368 Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01
# Conflicts:
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/sys/entity/vo/AppSettingVO.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/web/SalarySystemConfigController.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
2023-07-10 11:10:10 +08:00
Harryxzy 1fa04f1515 个税申报撤回开关-2 2023-06-29 16:42:48 +08:00
Harryxzy 2735661b4a 删除薪资档案 2023-06-29 10:35:55 +08:00
Harryxzy 3096954628 核算人员匹配规则(是否包含停薪列表)暂存 2023-06-16 14:40:36 +08:00
钱涛 affa437506 加密显示配置 2023-02-23 15:18:33 +08:00
钱涛 830304fabb 系统配置 2023-01-09 14:41:10 +08:00
钱涛 f5622df8fe Merge branch 'feature/report1110' into release/2.1.3.2211.03
# Conflicts:
#	src/com/engine/salary/sys/entity/param/AppSettingSaveParam.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
2022-11-09 19:03:14 +08:00
Harryxzy 0630fb7b7d 个税申报开关-查询是否开启 2022-11-08 13:58:21 +08:00
Harryxzy 1fb96be58b 个税申报开关 2022-11-08 11:22:56 +08:00
钱涛 f2fdbca8f7 脱敏表配置 2022-11-07 11:31:21 +08:00
李栋 60396e90a3 薪资档案加密设置 2022-10-10 09:43:57 +08:00
钱涛 e48f576617 显示应用设置接口 2022-09-28 10:08:51 +08:00
钱涛 23a1396c12 核算列表求和 2022-09-27 17:43:43 +08:00
钱涛 1573fc5bcf 人员状态枚举适配 2022-09-22 11:42:02 +08:00
钱涛 f678aa46d6 薪资档案排序 2022-09-19 18:21:34 +08:00
钱涛 830e099b57 排序规则 2022-09-19 16:44:32 +08:00
钱涛 d238502b2c 1、修复线下对比
2、系统配置
2022-09-15 15:15:34 +08:00
钱涛 8c0b9038d6 1、系统配置列表
2、修复调薪周期对于核算的结果不准确
2022-09-14 11:28:17 +08:00
钱涛 198075209e 1、核算、合并计税使用税款所属期作为依据
2、核算列表分页
2022-09-13 16:03:55 +08:00
钱涛 c8d056ee2f 薪酬版本记录 2022-07-12 17:28:06 +08:00