 钱涛
|
321a565c35
|
fix个税sql错误
|
2023-10-26 14:40:56 +08:00 |
|
钱涛
|
e8f124d58c
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-17 10:25:02 +08:00 |
|
钱涛
|
b4a1aa8039
|
修改系统公式异常
|
2023-10-16 10:52:28 +08:00 |
|
钱涛
|
5d3e2928c9
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-13 16:54:46 +08:00 |
|
钱涛
|
855effccc5
|
修改系统公式异常
|
2023-10-13 16:54:33 +08:00 |
|
钱涛
|
053e2855d7
|
个税sql
|
2023-10-13 16:33:06 +08:00 |
|
钱涛
|
4a59859fa8
|
调薪记录
|
2023-10-12 17:34:09 +08:00 |
Harryxzy
|
8e8a502738
|
prop
|
2023-10-12 14:26:28 +08:00 |
|
钱涛
|
59f24d3a14
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
|
2023-10-09 16:15:21 +08:00 |
|
钱涛
|
e570c1879e
|
账套保存异常
|
2023-10-09 15:35:20 +08:00 |
|
钱涛
|
26bbc9c0ee
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-10-08 14:21:25 +08:00 |
|
钱涛
|
d98933832a
|
Merge branch 'feature/生成签名pdf' into release/2.9.6.2310.01
# Conflicts:
# src/com/engine/salary/web/SalaryBillController.java
|
2023-10-07 15:19:38 +08:00 |
|
钱涛
|
5602d65ed8
|
Merge branch 'release/2.9.5.2309.01' into release/个税版本
# Conflicts:
# resource/WEB-INF/prop/hrmSalaryCustom.properties
|
2023-09-22 17:59:06 +08:00 |
|
钱涛
|
7c5af2166e
|
日期格式自定义配置
|
2023-09-22 17:57:47 +08:00 |
|
钱涛
|
0545c6eb8c
|
Merge branch 'release/2.9.5.2309.01' into release/个税版本
|
2023-09-21 16:58:15 +08:00 |
|
Harryxzy
|
cdefb1d310
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 11:45:34 +08:00 |
|
Harryxzy
|
97b451e203
|
sql
|
2023-09-21 10:05:32 +08:00 |
|
钱涛
|
b0a25f6cf0
|
删除与组织冲突sql
|
2023-09-19 11:37:37 +08:00 |
|
钱涛
|
12480f8306
|
生成工资单pdf签名
|
2023-09-18 18:45:59 +08:00 |
|
钱涛
|
464bb9d623
|
Merge branch 'release/个税二期' into release/个税版本
|
2023-09-06 17:06:07 +08:00 |
|
钱涛
|
d49b33c66f
|
Merge branch 'release/个税一期' into release/个税版本
|
2023-09-06 11:40:34 +08:00 |
|
钱涛
|
f9611212d4
|
个税解析
|
2023-09-06 11:40:22 +08:00 |
|
钱涛
|
6059174e7c
|
往期累计的在线获取
|
2023-09-06 09:40:50 +08:00 |
|
钱涛
|
f245bd2f49
|
新增往期累计字段
|
2023-09-05 11:04:53 +08:00 |
|
钱涛
|
96bfdf05ed
|
在线获取累计专项附加扣除
|
2023-09-04 14:20:42 +08:00 |
|
钱涛
|
6871316f98
|
Merge branch 'release/2.9.4.2308.02' into release/个税一期
# Conflicts:
# resource/WEB-INF/prop/hrmSalaryCustom.properties
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2023-09-04 09:30:24 +08:00 |
|
钱涛
|
5ef4c8c909
|
解决sql202307100103.sql与组织冲突
|
2023-09-01 11:33:20 +08:00 |
|
钱涛
|
0ac2fd248e
|
慢sql提醒
|
2023-08-31 16:22:02 +08:00 |
|
钱涛
|
2fad3c6c7c
|
Merge branch 'feature/慢sql检测' into release/2.9.4.2308.02
|
2023-08-31 15:46:29 +08:00 |
|
钱涛
|
283485929f
|
超时提醒
|
2023-08-31 15:31:34 +08:00 |
sy
|
cd5e5d2284
|
薪酬系统-ST数据库适配，神通数据库-薪酬非标初始化脚本
|
2023-08-31 14:04:41 +08:00 |
|
钱涛
|
f7f1a85441
|
流量不足提醒
|
2023-08-31 10:34:26 +08:00 |
|
钱涛
|
b5f9477c90
|
流量监控
|
2023-08-28 13:31:11 +08:00 |
|
钱涛
|
1cd07d7986
|
去除为空校验
|
2023-08-24 16:49:53 +08:00 |
|
钱涛
|
4ea735a731
|
个税标签和菜单
|
2023-08-24 16:29:13 +08:00 |
|
钱涛
|
45e69cd6c8
|
导出
|
2023-08-24 11:36:17 +08:00 |
|
钱涛
|
7e7615bf4a
|
账套薪资项目添加code
|
2023-08-23 16:20:45 +08:00 |
|
钱涛
|
bb2d2d64e6
|
在线申报接口
|
2023-08-21 19:35:14 +08:00 |
|
钱涛
|
988139610b
|
Merge branch 'release/2.9.4.2308.02' into release/230803对接个税
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/web/SalarySobController.java
|
2023-08-18 09:36:26 +08:00 |
|
Harryxzy
|
ea1a46839d
|
Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01
|
2023-08-17 16:07:24 +08:00 |
|
Harryxzy
|
343edd2df7
|
sql
|
2023-08-17 16:06:55 +08:00 |
|
钱涛
|
914963135a
|
个税对接辅助缴款
|
2023-08-17 14:55:32 +08:00 |
|
钱涛
|
414f960346
|
账套-个税字段对应、累计字段对应
|
2023-08-17 09:22:09 +08:00 |
|
钱涛
|
3004394e96
|
账套-个税字段对应、累计字段对应
|
2023-08-15 20:50:47 +08:00 |
|
钱涛
|
cf22685fca
|
账套-个税字段对应、累计字段对应
|
2023-08-15 20:48:09 +08:00 |
|
钱涛
|
090b100784
|
个税对接，个税申报接口
|
2023-08-14 20:29:19 +08:00 |
|
钱涛
|
b1817142b0
|
个税对接，个税申报接口
|
2023-08-14 20:07:29 +08:00 |
|
Harryxzy
|
19cb2d9622
|
Merge branch 'feature/230703-薪资账套项目页面改造' into release/2.9.3.2308.01
|
2023-08-14 09:19:20 +08:00 |
|
Harryxzy
|
7ebb8d6618
|
Merge branch 'feature/230702-自定义工资项目展示名' into release/2.9.3.2308.01
|
2023-08-14 09:19:04 +08:00 |
|
钱涛
|
dc63897165
|
个税对接，个税申报接口
|
2023-08-11 14:20:14 +08:00 |