Commit Graph

13 Commits

Author SHA1 Message Date
钱涛 33914eae1d 解密 2022-06-10 18:07:25 +08:00
钱涛 e83714ba4f Merge branch 'feature/encrypt' into release
# Conflicts:
#	src/com/engine/salary/biz/AddUpSituationBiz.java
#	src/com/engine/salary/biz/SIArchivesBiz.java
#	src/com/engine/salary/cmd/datacollection/OtherDeductionGetDetailListCmd.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
#	src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java
#	src/com/engine/salary/entity/datacollection/dto/OtherDeductionRecordDTO.java
#	src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/SISchemeServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
#	src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
2022-06-10 15:26:43 +08:00
钱涛 ec3838a292 申报表 2022-06-10 13:33:48 +08:00
钱涛 382620c589 申报表 2022-06-09 19:02:18 +08:00
钱涛 61346f139b 申报和往期异常 2022-06-08 17:59:30 +08:00
钱涛 860c89b560 申报和往期异常 2022-06-08 16:36:50 +08:00
MustangDeng bfcb9a78f8 bug修改 2022-06-06 21:21:10 +08:00
钱涛 3f958d2886 暂存 2022-05-31 18:27:33 +08:00
钱涛 6f3d8e85c0 个税申报bug 2022-05-09 17:47:19 +08:00
18895359881@163.com d15cccca8d 申报表生成 2022-04-20 21:36:27 +08:00
18895359881@163.com bfdb9a33d5 个税申报表接口 2022-04-19 20:58:30 +08:00
18895359881@163.com 6fce8cdf4c 薪酬接口 2022-04-18 18:56:17 +08:00
18895359881@163.com 3e64b1cfde 薪酬接口 2022-04-16 15:33:51 +08:00