Commit Graph

17 Commits

Author SHA1 Message Date
钱涛 3dc8f6d57c Merge branch 'release/2.14.1.2405.01' into release/个税版本 2024-05-20 09:56:12 +08:00
钱涛 4c3b34e376 sql 2024-05-17 15:41:15 +08:00
钱涛 6de3b1454d 获取档案信息sql 2024-05-16 14:06:38 +08:00
钱涛 04978dd8e6 Merge branch 'release/2.14.1.2405.01' into release/个税版本 2024-05-13 14:01:22 +08:00
钱涛 e7dee966d6 二开说明 2024-05-09 17:27:28 +08:00
钱涛 bcc1e35117 拦截核算记录样例 2024-05-08 17:28:43 +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
钱涛 4682866674 档案sql 2024-04-25 14:25:40 +08:00
钱涛 0661406c97 Merge branch 'release/2.13.1.2404.02' into release/个税版本
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
2024-04-25 11:47:47 +08:00
钱涛 d802d890d6 处理解密问题 2024-04-25 11:45:37 +08:00
钱涛 68d0003f62 新增核算结果的代理 2024-04-16 16:05:42 +08:00
钱涛 2a692b13b4 外籍人员v1 2024-03-29 10:44:55 +08:00
钱涛 452d7bc57c Merge branch 'release/3.0.0.2403.01' into release/个税版本
# Conflicts:
#	src/com/engine/salary/entity/datacollection/AddUpSituation.java
#	src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
2024-03-12 18:56:12 +08:00
钱涛 e22e178d08 去除非标准功能 2024-03-12 14:51:28 +08:00
钱涛 e81937c4dd 去除报表原先的表 2024-03-07 11:45:26 +08:00
钱涛 cb005d717a 添加wiki目录 2024-03-05 17:40:10 +08:00
钱涛 c2eab7ce64 添加wiki目录 2024-03-05 17:37:47 +08:00