Commit Graph

19 Commits

Author SHA1 Message Date
钱涛 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
钱涛 b8972bcd43 分权v3 2022-06-09 17:45:28 +08:00
钱涛 cedc9f2644 考勤和申报表的分权 2022-06-07 15:43:22 +08:00
钱涛 bb665500ae 档案 2022-06-01 19:14:05 +08:00
钱涛 7ffc241b0a 管理 2022-05-31 21:48:00 +08:00
钱涛 efd31013cd 薪资账套分权 2022-05-31 21:05:59 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +08:00
钱涛 841ca27c84 暂存 2022-05-27 17:21:39 +08:00
MustangDeng 05f529769c 加解密 2022-05-24 09:23:17 +08:00
钱涛 ed0ba7ed6d 暂存 2022-05-19 14:50:01 +08:00
钱涛 fa4d605c8d 暂存 2022-05-18 09:19:50 +08:00
MustangDeng a93949e8c5 Merge branch 'feature/salaryBill' into develop
# Conflicts:
#	src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
2022-04-21 15:42:47 +08:00
MustangDeng 38179daee9 我的工资单 2022-04-21 14:46:45 +08:00
钱涛 36d65de007 fix 2022-04-21 14:15:56 +08:00
钱涛 ba707878fc 薪资档案 2022-03-28 20:04:27 +08:00
钱涛 1e134de35b 税率表详细信息接口 2022-03-02 11:09:23 +08:00
钱涛 f591c09dc9 个税扣缴义务人相关接口(6) 2022-02-28 17:19:07 +08:00
钱涛 4a081d6ad9 初始化项目结构、demo样例、mybatis使用样例 2022-02-25 19:41:22 +08:00