Commit Graph

17 Commits

Author SHA1 Message Date
钱涛 8dc2ddc3c8 加密方法 2022-12-12 09:37:15 +08:00
钱涛 6ddf483767 加解密 2022-06-10 16:43:38 +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
MustangDeng a24cb2e6d6 加解密自测问题处理 2022-06-02 17:01:26 +08:00
钱涛 d800ab1925 Merge branch 'develop' into release 2022-05-31 18:29:34 +08:00
钱涛 3f958d2886 暂存 2022-05-31 18:27:33 +08:00
钱涛 f8ecb548ed Merge branch 'auth' into release
# Conflicts:
#	src/com/engine/salary/biz/AddUpDeductionBiz.java
#	src/com/engine/salary/biz/AddUpSituationBiz.java
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/biz/SIArchivesBiz.java
#	src/com/engine/salary/biz/SalaryArchiveBiz.java
#	src/com/engine/salary/biz/SalaryArchiveItemBiz.java
#	src/com/engine/salary/biz/SalaryItemBiz.java
#	src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
#	src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java
#	src/com/engine/salary/cmd/datacollection/AddUpSituationImportCmd.java
#	src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
#	src/com/engine/salary/enums/UserStatusEnum.java
#	src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
#	src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java
2022-05-30 18:50:00 +08:00
钱涛 60ae1ff35b sqlserver
适配
2022-05-27 18:07:26 +08:00
钱涛 bf364a7639 暂存 2022-05-24 15:20:12 +08:00
钱涛 f555192e70 升级 2022-05-24 11:24:21 +08:00
钱涛 d77e8b0de4 累计扣除字段 2022-05-20 14:41:42 +08:00
钱涛 b0ee96eb41 导入模板改为内存生成 2022-04-28 17:44:26 +08:00
钱涛 11190ee37d 区时+8 2022-04-24 17:42:32 +08:00
钱涛 4e9d103021 fix bug 2022-03-12 14:20:39 +08:00
钱涛 692a57ae63 累计bug 2022-03-11 15:47:08 +08:00
钱涛 98c49db986 其他扣除项接口 2022-03-10 17:57:46 +08:00
钱涛 e860b30567 累计附加接口 2022-03-08 18:10:03 +08:00