qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,580 Commits 293 Branches 39 Tags 49 MiB
Commit Graph

1233 Commits

Author SHA1 Message Date
钱涛 c7659e0717 数据采集权限 2024-09-11 10:28:20 +08:00
钱涛 3614f89982 业务线权限接口 2024-09-10 13:37:21 +08:00
钱涛 a0fb036bce 业务线配置 2024-09-09 19:10:40 +08:00
钱涛 1dd8f12534 Merge branch 'release/2.15.1.2407.01' into feature/权限 
# Conflicts:
#	resource/wiki/扩展功能/hrmSalaryCustom.properties
 2024-09-09 14:20:56 +08:00
钱涛 09fb9898e7 完成账套和扣缴义务人接口 2024-09-09 11:13:10 +08:00
钱涛 17afe87356 申报表权限规则 2024-09-05 18:14:02 +08:00
钱涛 4d9f1e6ff4 申报权限按钮限制 2024-09-05 17:31:01 +08:00
钱涛 882716b10c 修复核算结果可能为空带来的影响 2024-09-05 14:13:43 +08:00
钱涛 920b0e31c4 账套扣缴义务人聚合查询 2024-09-05 10:26:52 +08:00
钱涛 4b0eee4798 工资单跨扣缴义务人发放 2024-09-04 15:39:54 +08:00
钱涛 5ccee97429 新建账套携带各扣缴义务人人员范围 2024-09-04 13:59:00 +08:00
钱涛 0b90f4890e 工资单支持跨扣缴义务人 2024-09-03 14:30:57 +08:00
Harryxzy 44c11c7dcc Merge branch 'feature/240801-社保方案上下限调整自动调整基数' into release/2.15.1.2407.01 2024-09-03 09:23:50 +08:00
钱涛 7f77f4cb12 获取账套关联扣缴义务人 2024-09-03 09:21:57 +08:00
钱涛 ecfa6a4604 跨扣缴义务人核算 2024-09-02 17:36:41 +08:00
钱涛 c72fa7fd7c 保存账套联系 2024-09-02 14:13:29 +08:00
钱涛 fdb1f76e01 保存业务线 2024-09-02 10:22:42 +08:00
钱涛 9d4362b46e 业务线分权 2024-08-30 17:22:10 +08:00
钱涛 49e6050c54 核算和账套的权限 2024-08-30 10:49:46 +08:00
钱涛 932ea6bedd 核算和账套的权限 2024-08-29 14:47:33 +08:00
钱涛 3721867723 核算和账套的权限 2024-08-28 17:55:42 +08:00
钱涛 9b96d0cff2 限制账套 2024-08-28 10:02:39 +08:00
钱涛 a2db71d403 Merge branch 'release/2.15.1.2407.01' into feature/权限 2024-08-26 11:11:31 +08:00
钱涛 42e91e32da 改为通过快照信息搜索 2024-08-26 09:26:42 +08:00
钱涛 a22aa624db 权限控制 2024-08-22 15:37:50 +08:00
钱涛 25321bb357 Merge branch 'release/2.15.1.2407.01' into feature/权限 2024-08-21 15:49:12 +08:00
钱涛 9fae93fcd7 Merge branch 'feature/导入工具' into release/2.15.1.2407.01 2024-08-20 11:40:33 +08:00
Harryxzy 6dc9650305 Merge branch 'release/2.15.1.2407.01' into feature/240801-社保方案上下限调整自动调整基数 2024-08-19 16:01:06 +08:00
Harryxzy 26d300299b 社保方案上下限 2024-08-19 12:07:03 +08:00
钱涛 9b390faf50 SQL适配 2024-08-19 11:33:15 +08:00
钱涛 a796752203 Merge branch 'release/2.15.1.2407.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
 2024-08-19 10:43:43 +08:00
钱涛 e2b2b9071f Merge remote-tracking branch 'origin/feature/240801-浮动薪资' into feature/240801-浮动薪资 2024-08-16 14:04:31 +08:00
钱涛 659560550a Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 13:18:08 +08:00
钱涛 7250ed3520 修复组织信息快照，主动添加或者sql添加人员丢失 2024-08-15 17:03:17 +08:00
Harryxzy 2ee605df44 浮动薪酬优化 2024-08-15 13:56:41 +08:00
钱涛 5071c08d8c Merge branch 'release/2.15.1.2407.01' into feature/导入工具 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
 2024-08-15 13:41:52 +08:00
钱涛 c5c469e4c4 修复邮件不显示入职日期 2024-08-15 11:54:18 +08:00
钱涛 2b2e9ea504 账套支持sql范围 2024-08-15 10:53:08 +08:00
钱涛 d37434521d Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-15 10:37:57 +08:00
钱涛 f74ec99644 账套支持sql范围 2024-08-15 10:37:41 +08:00
钱涛 9d26e1228f 薪酬迁移工具 2024-08-13 18:15:04 +08:00
Harryxzy 5055a4801a 浮动薪酬增加义务人 2024-08-12 16:36:27 +08:00
钱涛 ecb0f6f7bc excel导入工具 2024-08-12 15:16:06 +08:00
钱涛 b83d45efa0 下载系统配置 2024-08-12 10:02:46 +08:00
钱涛 31cd3981e2 添加日志 2024-08-09 17:30:44 +08:00
钱涛 71c9bd3564 xml文件 2024-08-09 15:53:36 +08:00
Harryxzy 75fb15928a 浮动薪酬 2024-08-09 10:21:40 +08:00
钱涛 dd257ec53e xml文件 2024-08-09 09:22:27 +08:00
钱涛 6532225da3 迁移工具 2024-08-08 18:04:50 +08:00
钱涛 83a408afa2 迁移工具 2024-08-08 16:53:31 +08:00
钱涛 080a69c929 全量迁移 2024-08-08 09:50:04 +08:00
钱涛 484639a690 导入薪资项目、模板、预览 2024-08-07 14:40:08 +08:00
钱涛 d30380e2e7 导入薪资项目、模板、预览 2024-08-07 14:23:35 +08:00
钱涛 48120f8e24 导入薪资项目 2024-08-07 09:06:09 +08:00
Harryxzy dd18cf5191 考勤引用多个账套 2024-08-06 16:54:19 +08:00
钱涛 bd6e30b63b 导入薪资项目 2024-08-06 14:24:08 +08:00
钱涛 23ed2c5f3f 删除、同步对象设置 2024-08-06 10:46:33 +08:00
钱涛 10d988084b 导入工具 2024-08-06 10:32:57 +08:00
钱涛 84cb57ccd7 Merge branch 'release/2.15.1.2407.01' into feature/权限 2024-08-05 17:23:47 +08:00
钱涛 ff00de206c 线下对比 2024-08-05 17:23:25 +08:00
钱涛 4dcb3b4fea 薪资档案分权 2024-08-05 15:40:34 +08:00
钱涛 4d8c54bf8a 角色加描述 2024-08-02 16:18:26 +08:00
钱涛 494679087d 角色加描述 2024-08-02 14:04:14 +08:00
钱涛 9eea989bf2 显示扣缴义务人的角色 2024-08-02 10:10:04 +08:00
钱涛 4d51b6e57c 显示扣缴义务人的角色 2024-08-01 18:04:09 +08:00
钱涛 a0d2db2702 角色 2024-08-01 16:19:23 +08:00
钱涛 c674c22da1 在线算税重试处理 2024-08-01 10:56:29 +08:00
Harryxzy 8d057e2706 Merge branch 'feature/240702-编辑核算时人员信息' into release/2.15.1.2407.01 2024-08-01 10:53:29 +08:00
Harryxzy 8bbf8f3ff6 核算时编辑职称bug 2024-08-01 10:52:44 +08:00
钱涛 a8b487c94b Merge branch 'release/2.15.1.2407.01' into feature/权限 
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2024-08-01 10:16:05 +08:00
钱涛 241a85c711 默认值 2024-07-31 14:59:03 +08:00
钱涛 87a5eb59c6 暂存 2024-07-30 17:45:02 +08:00
钱涛 fad1402b06 权限项配置 2024-07-29 16:00:27 +08:00
钱涛 63012fd62a 成员列表 2024-07-29 13:28:46 +08:00
钱涛 0b091eee12 成员表达式变更 2024-07-26 14:32:35 +08:00
钱涛 e30ae5a2a1 成员表达式变更 2024-07-26 14:30:14 +08:00
钱涛 4543539206 角色和成员基础接口 2024-07-26 11:35:17 +08:00
Harryxzy ec669c1f51 核算时编辑人员组织信息 2024-07-25 17:51:38 +08:00
Harryxzy bdd27bcfc6 核算时编辑人员组织信息 2024-07-25 14:04:14 +08:00
Harryxzy 78cdadbb99 工资单详情 - 显示列定制 2024-07-16 11:30:25 +08:00
Harryxzy 84ce2821f6 1、定薪、返聘action优化 
2、修复导出时excel中双击单元格变成黑色
 2024-07-10 14:01:09 +08:00
钱涛 edddf5f557 处理8位小数问题 2024-06-28 14:42:23 +08:00
钱涛 9c7c6de614 核算信息快照 2024-06-27 16:10:30 +08:00
Harryxzy c1c8bae9da Merge branch 'fix/240603_薪资明细导出排序' into release/2.14.5.2406.03 2024-06-26 10:37:51 +08:00
Harryxzy 63c7477966 1、薪资明细导出根据显示列定制导出 
2、薪资档案 高级搜索支持个税扣缴义务人多选
 2024-06-26 10:35:05 +08:00
钱涛 993f21b448 Merge branch 'feature/人员信息快照' into release/2.14.5.2406.03 
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
 2024-06-21 14:17:36 +08:00
钱涛 e5d66373e6 默认值需要导致异动 2024-06-20 14:47:19 +08:00
钱涛 0961071980 Merge remote-tracking branch 'origin/feature/240502_薪资项目增加默认值设置' into feature/240502_薪资项目增加默认值设置 
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
 2024-06-19 11:23:43 +08:00
钱涛 f0fce26e8a Merge branch 'release/2.14.4.2406.02' into feature/240502_薪资项目增加默认值设置 
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
 2024-06-19 11:14:31 +08:00
钱涛 81c768b7b9 人员信息快照 2024-06-18 15:28:31 +08:00
钱涛 0c0c754a9d 人员信息快照 2024-06-18 11:01:58 +08:00
Harryxzy 216c4cee84 默认值temp 2024-06-17 17:58:01 +08:00
钱涛 64e34d6d08 工资单预览 2024-06-13 17:46:37 +08:00
钱涛 1983ba968c 去除日志 
系统薪资项目配置不需要重启
 2024-06-12 15:35:40 +08:00
钱涛 853482141f 小数位支持10位 2024-06-12 10:45:32 +08:00
钱涛 f073f6d90c 处理刷新非正常人员问题 2024-06-11 15:48:07 +08:00
钱涛 c86b53fd27 Merge branch 'feature/锁定人员' into release/2.14.3.2406.01 2024-05-30 17:06:57 +08:00
钱涛 9aa2a03425 Merge branch 'release/2.14.2.2405.02' into release/2.14.3.2406.01 2024-05-30 14:41:45 +08:00
钱涛 9e8e7f1f09 删除隐藏 2024-05-30 14:41:28 +08:00
钱涛 7952e93d01 考勤引用显示证件号码 2024-05-29 16:53:51 +08:00
钱涛 63851a1fe7 社保福利通过证件号码导入 2024-05-29 15:32:19 +08:00
钱涛 238438897b 处理工资单证件号码不显示 2024-05-29 14:04:16 +08:00
钱涛 2c79afa65e 锁定人员 2024-05-28 17:29:18 +08:00
钱涛 bc5735135c Merge branch 'feature/身份证导入' into release/2.14.3.2406.01 2024-05-28 11:28:18 +08:00
钱涛 11802dad91 根据身份证导入 2024-05-28 11:18:19 +08:00
钱涛 43db025d98 Merge branch 'feature/账套副本' into release/2.14.2.2405.02 2024-05-23 11:36:38 +08:00
Harryxzy bf50976849 Merge branch 'fix/240302-社保福利编辑保存改造' into release/2.14.2.2405.02 2024-05-23 10:58:30 +08:00
钱涛 1b3da7dfc0 身份证 2024-05-23 09:16:28 +08:00
Harryxzy 0facbabf55 薪资项目增加默认值temp 2024-05-20 15:04:14 +08:00
钱涛 3b9981e189 处理短信发送空值 2024-05-14 15:18:32 +08:00
钱涛 11cbf23b8f 统一进位规则 2024-05-14 14:27:19 +08:00
钱涛 38ebbb9928 解决并发问题 2024-05-14 13:28:58 +08:00
Harryxzy 509257b419 pdf导出前先校验生成pdf 2024-05-11 15:07:54 +08:00
Harryxzy 1c1a77d387 移动端工资单列表返回登陆人id 2024-05-10 15:41:40 +08:00
钱涛 6d4265acf1 职称显示为中午 2024-05-08 15:31:36 +08:00
钱涛 c97618bd97 修复社保福利修改时没有小数位问题 2024-05-08 11:15:52 +08:00
钱涛 1cb89a9d1b 账套快照-工资单模板 2024-05-06 17:41:39 +08:00
钱涛 3428de9e33 账套快照 2024-05-06 16:03:29 +08:00
Harryxzy 4b474f864f 累计专项附加扣除一键累计，能根据义务人进行累计 2024-04-30 14:43:37 +08:00
Harryxzy 8ae76f9b65 Merge branch 'release/2.13.1.2404.02' into feature/工资单审批 2024-04-30 10:26:58 +08:00
Harryxzy 1800c02e58 盛威 2024-04-29 16:08:18 +08:00
Harryxzy d7de02696d 工资单审批，增加规则配置 2024-04-28 16:58:33 +08:00
Harryxzy 4f391a2159 工资单审批 2024-04-26 11:24:47 +08:00
钱涛 c9075058d5 跳过人员范围校验 2024-04-25 13:45:59 +08:00
Harryxzy 11304bebed 薪资审批 2024-04-24 15:55:41 +08:00
Harryxzy 44ed332ed5 修复ecology的多语言导致乱码 2024-04-08 17:57:59 +08:00
Harryxzy 2242723d3f Merge branch 'feature/240302-薪资核算导出模板' into release/2.12.1.2403.02 2024-04-03 11:39:30 +08:00
钱涛 a06a54f574 去除objectUtil 2024-04-01 20:25:23 +08:00
Harryxzy 7557c1b330 薪资核算导出模板优化 2024-03-29 15:45:45 +08:00
Harryxzy 5d2cc92bf8 Merge branch 'feature/240302-薪资明细表' into release/2.12.1.2403.02 
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
 2024-03-29 10:49:39 +08:00
Harryxzy 582abc061a 薪资核算导出模板 2024-03-29 10:46:51 +08:00
Harryxzy 0d6bf4dfe3 薪资核算导出模板修复 2024-03-28 18:28:22 +08:00
Harryxzy 1c40ed0ecd 薪资核算导出模板 2024-03-26 17:04:56 +08:00
Harryxzy e3c528c649 薪资明细表 2024-03-25 16:08:34 +08:00
Harryxzy 25c2e2f1c1 其他维度 2024-03-22 15:23:03 +08:00
Harryxzy 18c496c009 多部门多分部筛选 2024-03-21 14:19:36 +08:00
Harryxzy 0c444acd38 多部门多分部筛选 2024-03-21 14:19:03 +08:00
Harryxzy 216a2c67d3 社保福利编辑保存改造 2024-03-20 14:47:41 +08:00
Harryxzy b17d2b70de Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 09:19:03 +08:00
钱涛 0a7334ddef 考勤导入，多语言 2024-03-14 18:16:20 +08:00
钱涛 29e81e03c2 优化公式不显示未启用的考勤字段 2024-03-14 16:08:16 +08:00
钱涛 417c9f703d 下载模板时带出数据 2024-03-14 15:28:14 +08:00
Harryxzy b5afaa54df Merge branch 'release/3.0.0.2403.01' into feature/240301_阅后即焚 2024-03-12 15:13:34 +08:00
钱涛 836947725f 切换了elog位置 2024-03-12 14:34:44 +08:00
钱涛 4b823ccca7 国际化注解 2024-03-11 16:50:47 +08:00
Harryxzy 78d4f5e2ae 阅后即焚 2024-03-11 10:35:56 +08:00
钱涛 729c6c7d3a 处理空指针 2024-03-07 14:12:16 +08:00
钱涛 78c1d6f51c 项目日志字段解释 2024-03-06 15:20:21 +08:00
Harryxzy 20d7266db9 Merge branch 'feature/240201_社保福利台账导入字段缓存' into release/2.11.1.2402.01 
# Conflicts:
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
 2024-03-06 13:50:56 +08:00
Harryxzy 6c2d20a5a7 Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01 2024-03-05 14:24:19 +08:00
钱涛 1c62be09d1 Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-05 13:58:50 +08:00
Harryxzy 3f76b5bbbf 非系统人员管理日志 2024-03-04 16:12:30 +08:00
Harryxzy 5485f7d260 社保福利台账导入，表单字段缓存 2024-03-01 17:40:19 +08:00
钱涛 a1ab3c79f4 添加账套筛选条件 2024-02-28 14:43:27 +08:00
Harryxzy 1261194d88 操作日志优化 2024-02-27 11:30:14 +08:00
Harryxzy 093cb34f77 操作日志fix some bugs 2024-02-23 15:11:56 +08:00
Harryxzy a39806bb92 我的薪资福利显示页签支持配置 2024-02-23 11:04:14 +08:00
Harryxzy 5c5dcdabb2 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-22 09:44:02 +08:00
Harryxzy f591074fc1 日志 2024-02-22 09:43:47 +08:00
sy f7eb698c4c Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-22 09:34:09 +08:00
Harryxzy dee20149bb 日志 2024-02-21 18:19:02 +08:00
sy e813a195f5 Merge remote-tracking branch 'origin/feature/操作日志组件' into feature/操作日志组件 2024-02-20 17:05:04 +08:00
sy 4f372645ec Merge remote-tracking branch 'remotes/origin/fix/240101-福利方案，自定义福利详情获取接口增加返回参数' into release/2.10.1.2401.01 2024-02-20 17:00:25 +08:00
sy 7804936e52 薪酬系统-福利方案，自定义福利列表返回结果优化 2024-02-20 16:59:18 +08:00
sy 088a5c1d72 薪酬系统-福利台账，正常缴纳页相关功能操作日志添加 2024-02-20 16:50:45 +08:00
Harryxzy 117dbeb211 Merge branch 'fix/240101_考勤引用查看数据报错' into feature/操作日志组件 2024-02-20 10:10:22 +08:00
Harryxzy b4f36ab101 Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01 2024-02-20 09:51:00 +08:00
Harryxzy 7fe03ac7a1 工资单确认反馈优化 2024-02-19 10:09:49 +08:00
sy 6a79b22c17 薪酬系统-福利档案，增加操作日志 2024-02-07 17:39:26 +08:00
sy 5783342b01 薪酬系统-福利方案，方案新建、复制、删除功能增加操作日志 2024-02-05 14:06:52 +08:00
sy f4ecb19ef2 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 2024-02-01 10:21:47 +08:00
Harryxzy e75cfae309 Merge branch 'feature/240101_工资单反馈区分pc和移动端' into release/2.10.1.2401.01 2024-01-31 16:13:27 +08:00
Harryxzy a502cd84a2 Merge branch 'fix/240101_回算工资单发放后不能再次回算' into release/2.10.1.2401.01 2024-01-31 16:12:52 +08:00
Harryxzy 2331ef354e 工资单确认和反馈按钮分开 2024-01-30 15:53:55 +08:00
sy 8237ed48a6 Merge remote-tracking branch 'remotes/origin/feature/240101工资单模板复制优化及福利基数调整记录优化' into release/2.10.1.2401.01 2024-01-30 14:32:59 +08:00
Harryxzy 12f66512df 工资单反馈区分pc和移动端 2024-01-30 13:50:05 +08:00
钱涛 65f972846f 处理id超过2100 2024-01-30 10:26:44 +08:00
钱涛 d2216eee13 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
 2024-01-29 15:07:58 +08:00
钱涛 6a8c9aebe3 修复考勤引用数据失败bug 2024-01-29 10:05:30 +08:00
sy f215b45afa 薪酬系统-工资单模板，复制功能改造，获取带选择薪资项目逻辑改造 2024-01-26 10:04:53 +08:00
sy 56c9557b3a Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化 
# Conflicts:
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
 2024-01-25 11:43:11 +08:00
sy 8eeb358dcc Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化 2024-01-25 11:41:44 +08:00
钱涛 6fc8d8fdee 去除达梦驱动 2024-01-25 11:38:38 +08:00
sy 4da07b9e80 薪酬系统-福利档案、台账，基数调整记录列表查询增加分权，台账查询条件支持个税扣缴义务人多选 2024-01-24 14:35:55 +08:00
钱涛 5bf00a98aa 记录核算日志 2024-01-24 09:50:58 +08:00
Harryxzy 71f90882d3 工资单反馈区分pc和移动端 2024-01-23 16:45:09 +08:00
sy b84b5d1d6e Merge remote-tracking branch 'remotes/origin/feature/231202-福利台账自动核算并归档' into feature/240101工资单模板复制优化及福利基数调整记录优化 2024-01-23 15:37:46 +08:00
钱涛 a5303b42a8 Merge branch 'release/2.10.1.2401.01' into feature/操作日志组件 2024-01-23 14:08:14 +08:00
Harryxzy 2d24fbfa23 回算工资单发放后不能再次回算 2024-01-23 11:34:36 +08:00
sy 94d72cd93c 薪酬系统-工资单模板，复制功能改造 2024-01-23 10:52:53 +08:00
钱涛 6ee8b5f044 解决短信不换行问题 2024-01-22 15:41:38 +08:00
sy 56651196fa Merge remote-tracking branch 'remotes/origin/release/2.9.10.2312.02' into feature/231202-福利台账自动核算并归档 2024-01-22 11:03:37 +08:00
sy 29e5c27ffb 薪酬系统-福利台账，自动核算并归档任务类开发 2024-01-17 16:07:27 +08:00
Harryxzy e38fd9be99 薪资档案增加起始、结束发薪筛选 2024-01-15 10:51:53 +08:00
Harryxzy f5aa425f2c fix公式，人员状态变量没有值bug 2024-01-09 13:21:45 +08:00
Harryxzy 8164660ebf Merge branch 'feature/231202-批量编辑' into release/2.9.10.2312.02 
# Conflicts:
#	src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
 2024-01-08 15:34:32 +08:00
Harryxzy 5f7c1c641b Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02 2024-01-08 15:33:11 +08:00
sy a16ed64ac0 Merge remote-tracking branch 'remotes/origin/feature/231201-福利档案拆分个人和公司福利基数' into release/2.9.10.2312.02 2024-01-08 13:54:25 +08:00
Harryxzy 7945c84fbb 薪资项目宽度 2024-01-02 16:37:07 +08:00
钱涛 7e22711dcd 导入工具 2023-12-28 15:47:05 +08:00