 dxfeng
|
c35b323736
|
5、薪资账套中编辑账套增加所属城市；薪资核算页面中增加所属城市且可以通过所有城市进行筛选
|
2025-12-31 11:05:15 +08:00 |
|
dxfeng
|
a3a7d773a8
|
个税扣缴义务人 增加角色
|
2025-12-25 15:47:20 +08:00 |
 钱涛
|
fcf5a778c3
|
钱智，社保报表
|
2025-12-08 16:59:54 +08:00 |
|
钱涛
|
b46b270dd1
|
钱智，社保报表
|
2025-12-08 16:58:04 +08:00 |
|
钱涛
|
59720d9340
|
钱智版本
|
2025-12-04 17:15:13 +08:00 |
|
钱涛
|
a92bc80b64
|
钱智封存权限
|
2025-12-01 16:34:02 +08:00 |
|
钱涛
|
37e9e06c56
|
钱智封存功能
|
2025-12-01 15:07:00 +08:00 |
|
钱涛
|
c3b2dc2982
|
钱智社保报表
|
2025-12-01 11:35:41 +08:00 |
|
钱涛
|
55238f1dfe
|
钱智，需求
|
2025-11-28 13:27:32 +08:00 |
|
钱涛
|
ceb542ce89
|
Merge branch 'release/3.0.2.2504.01' into custom/钱智
|
2025-11-24 17:21:10 +08:00 |
|
钱涛
|
dcd37b9ad3
|
钱智，版本
|
2025-11-21 14:04:44 +08:00 |
|
钱涛
|
d6e67b6e4a
|
钱智，搜索
|
2025-11-21 11:10:16 +08:00 |
|
钱涛
|
84e57edee1
|
常见sql
|
2025-11-18 17:52:26 +08:00 |
|
钱涛
|
4c874c7569
|
Merge branch 'release/3.0.2.2504.01' into custom/钱智
|
2025-11-14 09:52:44 +08:00 |
|
钱涛
|
5c2c0f603f
|
Merge branch 'feature/批量操作' into custom/钱智
# Conflicts:
# src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
# src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationBatParam.java
# src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.java
# src/com/engine/salary/service/SIAccountService.java
# src/com/engine/salary/service/SalaryAcctRecordService.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/web/SalaryAcctController.java
# src/com/engine/salary/web/TaxDeclarationController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
|
2025-11-14 09:20:59 +08:00 |
|
钱涛
|
4b717e9b2c
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-11-13 11:38:08 +08:00 |
|
钱涛
|
6a061592e5
|
处理pg脚本
|
2025-11-13 11:37:46 +08:00 |
|
钱涛
|
0a1acc89d3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-29 15:46:38 +08:00 |
|
钱涛
|
b4994dab3f
|
常用sql
|
2025-10-29 15:46:24 +08:00 |
|
钱涛
|
e1106de20c
|
Merge branch 'release/3.0.2.2504.01' into custom/钱智
|
2025-10-29 09:43:24 +08:00 |
|
钱涛
|
038fac392c
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-10-21 16:56:09 +08:00 |
|
钱涛
|
953a590cca
|
常用sql
|
2025-10-21 16:55:42 +08:00 |
|
钱涛
|
0adfa422a4
|
版本
|
2025-10-13 13:47:55 +08:00 |
|
钱涛
|
613478b19c
|
钱智需求
|
2025-09-23 14:20:52 +08:00 |
|
钱涛
|
8f81b38d4d
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-09-16 14:21:26 +08:00 |
|
钱涛
|
2bd092ae11
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-07-11 17:19:10 +08:00 |
|
钱涛
|
ed5f6da8a6
|
缴款需要按照分类分别缴纳
|
2025-07-11 17:18:15 +08:00 |
|
钱涛
|
d3e40d1b9e
|
Merge branch 'release/2.19.1.2501.01' into release/个税版本
|
2025-07-07 10:21:36 +08:00 |
|
钱涛
|
9830b156a5
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
|
2025-07-07 10:21:09 +08:00 |
|
钱涛
|
8168a42b61
|
日志
|
2025-07-07 10:20:53 +08:00 |
|
钱涛
|
b55ea81e4e
|
日志
|
2025-07-07 10:20:24 +08:00 |
|
钱涛
|
4fd9883858
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-07-03 09:09:35 +08:00 |
|
钱涛
|
2a883868ba
|
Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
|
2025-07-02 20:08:08 +08:00 |
|
钱涛
|
cb02136ff6
|
免税收入
|
2025-07-01 18:37:50 +08:00 |
|
钱涛
|
53c8909de4
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-06-25 14:37:22 +08:00 |
|
钱涛
|
45acec8468
|
上线版本
|
2025-06-19 14:40:09 +08:00 |
|
钱涛
|
490e6ab0fe
|
Merge branch 'release/个税&业务线' into custom/钱智
|
2025-06-19 11:05:53 +08:00 |
|
钱涛
|
0b566561a0
|
Merge branch 'release/个税版本' into release/个税&业务线
|
2025-06-19 11:05:09 +08:00 |
|
钱涛
|
f5b1768438
|
利息股息红利所得sql
|
2025-06-19 10:49:29 +08:00 |
Harryxzy
|
5c2ede9736
|
sql
|
2025-06-10 10:52:24 +08:00 |
|
Harryxzy
|
773a128902
|
钱智 考勤引用二开
|
2025-05-23 14:05:11 +08:00 |
|
钱涛
|
603d31b095
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-05-09 16:28:56 +08:00 |
|
钱涛
|
ac1a767a29
|
版本
|
2025-05-09 10:19:58 +08:00 |
|
钱涛
|
98556e3a90
|
修改oracle去除;
|
2025-05-09 10:13:08 +08:00 |
|
钱涛
|
1a66a1f846
|
版本
|
2025-04-29 16:07:51 +08:00 |
|
钱涛
|
f638665b72
|
Merge branch 'release/个税&业务线' into custom/钱智
# Conflicts:
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
|
2025-04-22 16:05:31 +08:00 |
|
钱涛
|
110cec1b33
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-21 14:27:00 +08:00 |
|
钱涛
|
64ad0a30d4
|
修复sql部署异常
|
2025-04-21 10:33:06 +08:00 |
|
钱涛
|
4d56cde7a9
|
版本
|
2025-04-17 15:34:29 +08:00 |
|
钱涛
|
be8ede54df
|
Merge branch 'release/3.0.2.2504.01' into release/个税&业务线
|
2025-04-09 14:25:43 +08:00 |