 钱涛
|
0e1242daa7
|
根据身份证导入
|
2024-05-28 14:10:45 +08:00 |
|
钱涛
|
f595b1782a
|
Merge branch 'release/2.14.3.2406.01' into release/个税版本2.14.3.2406.01
|
2024-05-28 11:29:37 +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 |
|
钱涛
|
ffdbf20160
|
Merge branch 'release/2.14.2.2405.02' into release/个税版本
|
2024-05-27 13:48:02 +08:00 |
|
钱涛
|
98d45ebd32
|
处理内存溢出
|
2024-05-27 11:36:05 +08:00 |
|
钱涛
|
e2dec06735
|
隐藏身份证号
|
2024-05-27 10:52:26 +08:00 |
|
钱涛
|
24b2154cb3
|
隐藏身份证号
|
2024-05-27 10:48:46 +08:00 |
|
钱涛
|
ec5463c050
|
Merge branch 'release/2.14.2.2405.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
|
2024-05-27 10:37:39 +08:00 |
|
钱涛
|
2cd255136d
|
版本
|
2024-05-23 16:13:47 +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
|
51b4a3198c
|
修复报表数值项目出现文本值
|
2024-05-21 15:04:52 +08:00 |
|
钱涛
|
8bf2cda7c3
|
修复日期问题
|
2024-05-21 12:29:42 +08:00 |
|
钱涛
|
79cfa0cbc0
|
删除往期累计多余项目
往期累计别名设置
|
2024-05-21 10:50:17 +08:00 |
|
钱涛
|
3dc8f6d57c
|
Merge branch 'release/2.14.1.2405.01' into release/个税版本
|
2024-05-20 09:56:12 +08:00 |
|
钱涛
|
6a1b28c555
|
解决工资单null
|
2024-05-17 17:11:51 +08:00 |
|
钱涛
|
4c3b34e376
|
sql
|
2024-05-17 15:41:15 +08:00 |
|
钱涛
|
26d6efd827
|
pdf日志
|
2024-05-17 10:58:38 +08:00 |
|
Harryxzy
|
b76a87b125
|
社保福利编辑保存改造
|
2024-05-17 09:40:52 +08:00 |
|
钱涛
|
c146537684
|
修改计时说明
|
2024-05-16 15:56:49 +08:00 |
|
钱涛
|
6de3b1454d
|
获取档案信息sql
|
2024-05-16 14:06:38 +08:00 |
|
钱涛
|
3b9981e189
|
处理短信发送空值
|
2024-05-14 15:18:32 +08:00 |
|
钱涛
|
11cbf23b8f
|
统一进位规则
|
2024-05-14 14:27:19 +08:00 |
|
钱涛
|
0f1473801e
|
维护工具效率
|
2024-05-14 14:12:14 +08:00 |
|
钱涛
|
af819896e4
|
版本
|
2024-05-14 13:45:03 +08:00 |
|
钱涛
|
38ebbb9928
|
解决并发问题
|
2024-05-14 13:28:58 +08:00 |
|
钱涛
|
04978dd8e6
|
Merge branch 'release/2.14.1.2405.01' into release/个税版本
|
2024-05-13 14:01:22 +08:00 |
|
Harryxzy
|
dd54a10433
|
核算固定列头数优化
|
2024-05-11 16:19:25 +08:00 |
|
Harryxzy
|
509257b419
|
pdf导出前先校验生成pdf
|
2024-05-11 15:07:54 +08:00 |
|
Harryxzy
|
8d18c0e5cb
|
优化“薪资项目同步至账套”，薪酬总管理员能选到所有义务人下账套
|
2024-05-10 18:25:32 +08:00 |
|
Harryxzy
|
1c1a77d387
|
移动端工资单列表返回登陆人id
|
2024-05-10 15:41:40 +08:00 |
|
Harryxzy
|
845586cba2
|
test
|
2024-05-10 14:54:02 +08:00 |
|
钱涛
|
e7dee966d6
|
二开说明
|
2024-05-09 17:27:28 +08:00 |
|
钱涛
|
bcc1e35117
|
拦截核算记录样例
|
2024-05-08 17:28:43 +08:00 |
|
钱涛
|
6d4265acf1
|
职称显示为中午
|
2024-05-08 15:31:36 +08:00 |
|
钱涛
|
ec27cf5a08
|
Merge branch 'release/2.13.1.2404.02' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/AddUpDeductionService.java
# src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
|
2024-05-08 11:17:40 +08:00 |
|
钱涛
|
c97618bd97
|
修复社保福利修改时没有小数位问题
|
2024-05-08 11:15:52 +08:00 |
|
钱涛
|
6f2d65a4be
|
修复社保福利新建时没有小数位和进位规则对应问题
|
2024-05-08 10:49:08 +08:00 |
|
钱涛
|
bb32bdfe11
|
核算详细信息
|
2024-05-07 18:48:38 +08:00 |
|
钱涛
|
6b0606f5a4
|
自适应
|
2024-05-07 17:37:02 +08:00 |
|
钱涛
|
def5bae707
|
账套快照-隐藏字段脚本
|
2024-05-07 16:41:12 +08:00 |
|
钱涛
|
5c90909c0e
|
账套快照-解决导入、公式、详细详细不对应问题
|
2024-05-07 15:25:43 +08:00 |
|
钱涛
|
1cb89a9d1b
|
账套快照-工资单模板
|
2024-05-06 17:41:39 +08:00 |
|
钱涛
|
3428de9e33
|
账套快照
|
2024-05-06 16:03:29 +08:00 |
|
Harryxzy
|
b5b2c9ef1e
|
累计专项附加扣除一键累计，能根据义务人进行累计
|
2024-04-30 15:00:43 +08:00 |
|
Harryxzy
|
4b474f864f
|
累计专项附加扣除一键累计，能根据义务人进行累计
|
2024-04-30 14:43:37 +08:00 |
|
钱涛
|
7d7d2dc309
|
处理公式数组问题
|
2024-04-28 16:21:44 +08:00 |
|
Harryxzy
|
e7c46bc5e8
|
优化同步离职日期
|
2024-04-26 15:13:54 +08:00 |