Commit Graph

3427 Commits

Author SHA1 Message Date
Harryxzy 6fe2976b2a 万德隆带出薪资项目调整 2025-07-30 15:58:54 +08:00
Harryxzy 038b15db0f 万德隆调整 2025-07-23 21:06:17 +08:00
Harryxzy ded111bff0 万德隆fix 2025-07-23 10:49:02 +08:00
Harryxzy aa5aac7e48 万德隆调整 2025-07-22 17:17:47 +08:00
Harryxzy d3fc58a7e4 万德隆调整 2025-07-17 11:40:42 +08:00
Harryxzy db99e8239b 万德隆 动态薪资标准 2025-07-01 22:02:23 +08:00
Harryxzy f72d76540a Merge branch 'release/3.0.2.2504.01' into custom/万德隆 2025-06-30 14:26:28 +08:00
Harryxzy 3a1417b6a1 万德隆 动态薪资标准 2025-06-30 14:25:55 +08:00
Harryxzy 8399c61020 万德隆 2025-06-30 10:21:58 +08:00
Harryxzy 5cc0dda5f6 修复业务线版本个税申报bug 2025-06-27 13:45:57 +08:00
Harryxzy 5e634b1e79 Merge branch 'release/3.0.2.2504.01' into custom/万德隆 2025-06-25 16:04:28 +08:00
Harryxzy f0f90bce9e Merge branch 'feature/sql采用mybatis执行' into custom/万德隆 2025-06-25 15:28:17 +08:00
Harryxzy d0fdc7de2f 考勤天数=考勤次数/2 2025-06-25 15:26:26 +08:00
Harryxzy 2cd9484069 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-06-19 17:28:50 +08:00
Harryxzy bfd953d082 水印单独配置分部不显示 2025-06-19 17:28:09 +08:00
Harryxzy 71a3ba4569 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-06-19 11:39:25 +08:00
Harryxzy e402029f6c Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 2025-06-19 11:38:40 +08:00
Harryxzy 63c9558331 修复社保上下限校验 漏掉只开启了公司没开启个人的场景 2025-06-19 11:38:05 +08:00
钱涛 f7cba636b3 修复默认值保留位数 2025-06-18 17:21:22 +08:00
钱涛 a8c6e8e59e Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-06-18 13:32:41 +08:00
钱涛 919ade5715 Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 2025-06-18 13:32:17 +08:00
钱涛 de5caded9e 修复工资单性别问题 2025-06-18 13:32:12 +08:00
Harryxzy 5e0b9d2732 万德隆调薪流程支持停薪列表 2025-06-17 11:09:03 +08:00
Harryxzy 1263514a81 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-06-16 18:06:40 +08:00
Harryxzy c2f2390013 修复薪资明细导出,合计行统计文本字段 2025-06-16 16:41:38 +08:00
Harryxzy 2c39a1fa12 toMap空指针bug 2025-06-12 10:25:31 +08:00
Harryxzy 3b524dc87b 万德隆工资核算数据月度统计 2025-06-11 17:25:38 +08:00
Harryxzy 84339ab715 定时任务查询超1000bug 2025-06-10 17:35:44 +08:00
Harryxzy 3d0539a8b9 Merge branch 'release/3.0.2.2504.01' into custom/万德隆 2025-06-03 13:39:29 +08:00
Harryxzy 8876d9b491 万德隆 定薪调薪 2025-05-30 15:02:54 +08:00
Harryxzy af64d39fa7 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-05-29 10:56:23 +08:00
Harryxzy aff5dbf185 Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01 2025-05-29 10:39:32 +08:00
Harryxzy 578842aa39 修复数据穿透过滤条件 2025-05-29 10:39:06 +08:00
钱涛 61153309ca Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-05-27 15:57:28 +08:00
钱涛 1026ff1aae fix邮件中数据为null 2025-05-27 15:56:33 +08:00
钱涛 5ebae4208a Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-05-27 10:54:54 +08:00
钱涛 d9982d2508 fix邮件中数据为null 2025-05-27 10:46:11 +08:00
钱涛 5435a5a736 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-05-26 10:37:47 +08:00
钱涛 93dc70de26 fix邮件中数据为null 2025-05-26 10:36:38 +08:00
钱涛 79f23e4e5a Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-05-20 16:45:46 +08:00
钱涛 81e87ec9ce 优化,导出时过滤空字符串 2025-05-20 16:44:46 +08:00
Harryxzy bb84021758 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-05-13 16:29:02 +08:00
Harryxzy 05e92add4a 修复明细导出 2025-05-13 16:07:46 +08:00
钱涛 a0f85ea367 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-05-13 13:14:54 +08:00
钱涛 7de3dca2a3 撤回的工资单不允许查看 2025-05-13 13:14:30 +08:00
钱涛 af89a43da7 修复业务线权限 2025-04-30 11:04:18 +08:00
钱涛 ca75a5f403 fix导出明细 2025-04-29 16:57:33 +08:00
钱涛 1a66a1f846 版本 2025-04-29 16:07:51 +08:00
钱涛 23b1fae3a3 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-04-28 18:15:00 +08:00
钱涛 bc8e80b4e6 增加SUBSTR拦截处理 2025-04-28 18:14:17 +08:00