Commit Graph

21 Commits

Author SHA1 Message Date
钱涛 bf7d8dd634 导入时人员唯一校验 2022-06-13 17:05:36 +08:00
钱涛 081747b334 考勤引用修复 2022-06-13 10:52:32 +08:00
钱涛 b8972bcd43 分权v3 2022-06-09 17:45:28 +08:00
钱涛 be88b90f56 核算的分权 2022-06-02 17:10:54 +08:00
钱涛 99b5c36864 暂存 2022-05-31 16:41:11 +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
钱涛 3907ac49d9 fix bug 2022-05-30 18:03:20 +08:00
钱涛 841ca27c84 暂存 2022-05-27 17:21:39 +08:00
钱涛 e1b579d480 暂存 2022-05-25 13:10:03 +08:00
钱涛 d2a564cb92 sql兼容性处理 2022-05-06 16:01:33 +08:00
钱涛 e0c2fafede 考勤 2022-04-25 16:20:57 +08:00
钱涛 12efa69503 同步考勤字段值 2022-04-25 15:51:35 +08:00
钱涛 416ccd57a6 同步考勤字段值 2022-04-25 14:51:30 +08:00
钱涛 11190ee37d 区时+8 2022-04-24 17:42:32 +08:00
钱涛 3e9d02e78b 日期 2022-04-22 17:26:17 +08:00
钱涛 6b76829b39 考勤接口 2022-04-22 15:46:03 +08:00
钱涛 cd8df85e54 公式字段 2022-04-21 20:29:11 +08:00
钱涛 36d65de007 fix 2022-04-21 14:15:56 +08:00
钱涛 f8a704e66c 修改sql 2022-03-30 11:29:48 +08:00
钱涛 00bf811075 考勤导出接口 2022-03-16 14:29:02 +08:00
钱涛 1a49dd331d 考勤字段相关接口 2022-03-15 14:18:04 +08:00