Commit Graph

22 Commits

Author SHA1 Message Date
MustangDeng 62054871ce 发送工资单 2022-06-15 17:03:48 +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
钱涛 dc27578ddf 社保福利分权1.0 2022-06-06 16:55:02 +08:00
MustangDeng d3c82acac1 发送撤回工资单 2022-06-06 13:56:47 +08:00
MustangDeng a24cb2e6d6 加解密自测问题处理 2022-06-02 17:01:26 +08:00
钱涛 efd31013cd 薪资账套分权 2022-05-31 21:05:59 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +08:00
MustangDeng df3535c77d 和代码build处理 2022-05-31 16:02:41 +08:00
MustangDeng 05f529769c 加解密 2022-05-24 09:23:17 +08:00
钱涛 fa4d605c8d 暂存 2022-05-18 09:19:50 +08:00
钱涛 d2a37df97f 申报表异常 2022-05-09 11:46:49 +08:00
MustangDeng 2200d0c793 工资单撤回 2022-05-09 11:18:54 +08:00
钱涛 dff9657c3d 核算字段 2022-04-29 14:17:31 +08:00
钱涛 5c2bb1bf58 入职日期改为String 2022-04-28 10:05:27 +08:00
MustangDeng ee9116ae2b 工资单列表问题处理 2022-04-22 11:02:15 +08:00
MustangDeng 3003d0fadb 生成工资单 2022-04-21 16:45:03 +08:00
MustangDeng 38179daee9 我的工资单 2022-04-21 14:46:45 +08:00
MustangDeng a739d746f7 工资单发放-测试 2022-04-14 19:32:09 +08:00
MustangDeng 87ef976b7c 工资单发放-引包修改 2022-04-14 09:08:04 +08:00
MustangDeng bd8305763e 工资单发放-编译 2022-04-12 10:11:53 +08:00
MustangDeng 1573abd1ee Revert "工资单发放-todo"
This reverts commit b850f5ad
2022-04-11 14:30:30 +08:00
MustangDeng b850f5ad8d 工资单发放-todo 2022-04-11 14:28:45 +08:00