 钱涛
|
a026a8ff88
|
清除异常信息
|
2023-11-20 17:48:49 +08:00 |
|
钱涛
|
753eaa5b22
|
检查闭环
|
2023-11-17 16:00:59 +08:00 |
|
钱涛
|
1d1d322188
|
Merge branch 'release/2.9.8.2311.02' into release/个税版本
|
2023-11-17 14:21:15 +08:00 |
|
钱涛
|
c0e311bf57
|
不使用系统算税支持重新核算之前月份
|
2023-11-16 11:42:02 +08:00 |
|
钱涛
|
7f68931cc5
|
获取考勤假期余额
|
2023-11-13 17:23:33 +08:00 |
|
钱涛
|
7befa9f408
|
获取考勤假期余额
|
2023-11-13 17:23:09 +08:00 |
|
钱涛
|
443f2a749e
|
Merge branch 'release/3.0.0.2311.01' into release/2.9.8.2311.01
|
2023-11-13 17:20:04 +08:00 |
|
钱涛
|
fcd5846d08
|
Merge branch 'release/3.0.0.2311.02' into release/个税版本
|
2023-11-13 17:13:28 +08:00 |
|
钱涛
|
2c12b10171
|
1、减少人员bug
2、档案项目输入bug
|
2023-11-13 17:12:25 +08:00 |
|
钱涛
|
f3bc735fae
|
短信发送
|
2023-11-13 16:52:19 +08:00 |
|
钱涛
|
8eefec2e57
|
跳过考勤报表假期余额权限
|
2023-11-13 11:15:49 +08:00 |
|
钱涛
|
526c8f8514
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
|
2023-11-10 15:29:39 +08:00 |
|
钱涛
|
3dc5cc3a44
|
修改报表bug
|
2023-11-10 14:22:58 +08:00 |
|
钱涛
|
eb61811766
|
假期余额
|
2023-11-10 10:55:38 +08:00 |
|
钱涛
|
d86b00e5f7
|
清除加解密状态
|
2023-11-09 17:01:08 +08:00 |
|
钱涛
|
9ec0daa3f6
|
加密描述
|
2023-11-09 16:40:30 +08:00 |
Harryxzy
|
c88db43e55
|
Merge remote-tracking branch 'origin/release/3.0.0.2311.01' into release/3.0.0.2311.01
|
2023-11-09 16:19:35 +08:00 |
|
Harryxzy
|
025cb73a21
|
Merge branch 'feature/231101_返聘action' into release/3.0.0.2311.01
|
2023-11-09 16:18:00 +08:00 |
|
钱涛
|
0cfbe05c54
|
报表日期
|
2023-11-09 16:14:35 +08:00 |
|
钱涛
|
675e5d7972
|
扩展人员属性
|
2023-11-09 11:34:00 +08:00 |
|
钱涛
|
fdfeae9344
|
合并1101
|
2023-11-08 16:21:53 +08:00 |
|
钱涛
|
75717871d0
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
|
2023-11-08 16:20:31 +08:00 |
|
钱涛
|
e677207eac
|
新增统计维度展示
|
2023-11-08 15:59:54 +08:00 |
|
钱涛
|
d2ac1aec23
|
修改维度展示
|
2023-11-08 09:38:24 +08:00 |
|
钱涛
|
61d0e0f659
|
去除无效代码
|
2023-11-07 20:14:23 +08:00 |
|
钱涛
|
fbd19ecf75
|
缓存
|
2023-11-07 19:11:16 +08:00 |
|
钱涛
|
00f806a8e9
|
Merge branch 'release/3.0.0.2311.01' into feature/报表支持自定义维度
|
2023-11-07 19:06:57 +08:00 |
|
钱涛
|
bcee3c5e5a
|
人员属性扩展
|
2023-11-07 19:06:43 +08:00 |
|
钱涛
|
5f371a8e58
|
报表复制
|
2023-11-07 15:55:03 +08:00 |
|
钱涛
|
b30c9b1ca9
|
Merge branch 'feature/扩展人员维度属性' into feature/报表支持自定义维度
|
2023-11-07 14:45:27 +08:00 |
|
Harryxzy
|
3353cd67ce
|
Merge remote-tracking branch 'origin/release/3.0.0.2311.01' into release/3.0.0.2311.01
|
2023-11-07 11:24:59 +08:00 |
|
Harryxzy
|
f2a840576e
|
Merge branch 'fix/薪资核算导入下载模板bug' into release/3.0.0.2311.01
|
2023-11-07 11:24:25 +08:00 |
|
钱涛
|
68bc79ab0b
|
修改关键字
|
2023-11-07 11:00:00 +08:00 |
|
钱涛
|
b9d119bcf0
|
修改关闭解密方法
|
2023-11-07 10:00:51 +08:00 |
|
钱涛
|
36a77a8e0f
|
自定义报表维度
|
2023-11-06 18:46:49 +08:00 |
|
钱涛
|
43d627c23a
|
扩展维度属性
|
2023-11-06 11:32:25 +08:00 |
|
钱涛
|
74f7c71ffe
|
扩展维度属性
|
2023-11-06 11:19:00 +08:00 |
|
Harryxzy
|
0048001c54
|
返聘
|
2023-11-03 16:53:23 +08:00 |
|
Harryxzy
|
e018ec629f
|
返聘
|
2023-11-03 16:37:09 +08:00 |
|
Harryxzy
|
44233d74a8
|
返聘
|
2023-11-03 15:28:04 +08:00 |
|
钱涛
|
0634a139b9
|
显示字符统计规则
|
2023-11-02 18:41:58 +08:00 |
|
Harryxzy
|
f85f0af44a
|
下载核算导入模板，直接从缓存拿选的字段
|
2023-11-02 16:39:58 +08:00 |
|
Harryxzy
|
5d2218b8f0
|
返聘action
|
2023-11-02 16:22:24 +08:00 |
|
钱涛
|
83f38d1d74
|
显示字符统计规则
|
2023-11-02 14:43:15 +08:00 |
|
Harryxzy
|
f80bb620dd
|
返聘action
|
2023-11-02 14:21:33 +08:00 |
|
钱涛
|
8f333c4ad4
|
优化核算校验日期提示
|
2023-11-01 16:44:37 +08:00 |
|
钱涛
|
22a946d9ad
|
报表支持文本
|
2023-11-01 16:09:19 +08:00 |
|
钱涛
|
7fa3c31aac
|
报表支持文本
|
2023-11-01 09:54:09 +08:00 |
|
钱涛
|
b050888b7b
|
Merge branch 'release/3.0.0.2311.01' into release/个税版本
|
2023-10-31 17:19:09 +08:00 |
|
钱涛
|
4c11c54973
|
统一解密位置
|
2023-10-31 17:16:48 +08:00 |