Commit Graph

8 Commits

Author SHA1 Message Date
fcli dea2353ef2 Merge branch 'feature/变更分页' into feature/加密方法&分页merge
# Conflicts:
#	src/com/engine/salary/biz/SIAccountBiz.java
#	src/com/engine/salary/biz/SalaryArchiveItemBiz.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/SpecialAddDeductionServiceImpl.java
2022-12-14 10:57:41 +08:00
fcli d3de862d11 feat: 加密统一,薪资项目&社保档案详情... 2022-12-13 17:14:27 +08:00
fcli b58e71989d feat: 统一修改到内存分页 2022-12-12 10:25:55 +08:00
fcli eb7311f0f3 fix: 管理员可以编辑该扣缴义务人数据,其他人可以编辑本人数据&一键累计所有个税扣缴义务人下的人员 2022-11-09 10:40:55 +08:00
fcli 07a07d2be8 feat: 专项附加扣除模块, 权限限制,导入导出优化,添加一键累计 2022-11-09 10:40:48 +08:00
fcli 9b77bf7139 feat: 专项附加扣除模块, 一键清空、分页bug等 2022-11-09 10:40:38 +08:00
fcli 92a6512dc8 feat: 专项附加扣除模块,去除月份,添加普通用户登录查看本人记录功能 2022-11-09 10:40:28 +08:00
fcli 171f726bd3 feat: 专项附加扣除模块 2022-11-09 10:40:01 +08:00