Commits · 8acd040ac7ad498eda9ffb83113990836473b6a9 · 赵啸非 / attendance-performance-platform

29 Nov, 2023 3 commits
- Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform · 8acd040a
  姬鋆屾 authored Nov 29, 2023
  
  8acd040a
- 推 · 25048b0d
  姬鋆屾 authored Nov 29, 2023
  
  25048b0d
- 考勤汇总增加应到天数 · bcd09ec4
  廖旭伟 authored Nov 29, 2023
  
  bcd09ec4
28 Nov, 2023 1 commit
- 绩效核查确实时将核查时间改为绩效扣分发生时间 · eada306d
  廖旭伟 authored Nov 28, 2023
  
  eada306d
24 Nov, 2023 1 commit
- 回退：绩效核查汇总时由核查时间汇总改为发生时间汇总 · 76c4154f
  廖旭伟 authored Nov 24, 2023
  
  76c4154f
23 Nov, 2023 8 commits
- 绩效核查汇总时由核查时间汇总改为发生时间汇总 · 8570e55c
  廖旭伟 authored Nov 23, 2023
  
  8570e55c
- Merge remote-tracking branch 'origin/master' · 908aa5ae
  廖旭伟 authored Nov 23, 2023
  
  908aa5ae
- 考勤绩效核查记录时间查询条件改为异常时间 · f534457f
  廖旭伟 authored Nov 23, 2023
  
  f534457f
- Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform · 126e5082
  姬鋆屾 authored Nov 23, 2023
  
  126e5082
- 推 · 5ed97f6a
  姬鋆屾 authored Nov 23, 2023
  
  5ed97f6a
- 考勤绩效核查记录时间查询条件改为异常时间 · d7bc2e73
  廖旭伟 authored Nov 23, 2023
  
  d7bc2e73
- 考勤绩效核查记录时间查询条件改为异常时间 · 322521c9
  廖旭伟 authored Nov 23, 2023
  
  322521c9
- 考勤绩效核查记录时间查询条件改为异常时间 · eafd60a5
  廖旭伟 authored Nov 23, 2023
  
  eafd60a5
21 Nov, 2023 5 commits
- 考勤汇总更新时锁表BUg处理 · 885c8a4c
  廖旭伟 authored Nov 21, 2023
  
  885c8a4c
- 考勤汇总更新时锁表BUg处理 · 8c64b4db
  廖旭伟 authored Nov 21, 2023
  
  8c64b4db
- 考勤汇总更新时锁表BUg处理 · 1700b0c9
  廖旭伟 authored Nov 21, 2023
  
  1700b0c9
- Merge remote-tracking branch 'origin/master' · 988c9f4b
  廖旭伟 authored Nov 21, 2023
```
# Conflicts:
#	attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java
```
  988c9f4b
- 考勤汇总更新时锁表BUg处理 · 30d24015
  廖旭伟 authored Nov 21, 2023
  
  30d24015
14 Nov, 2023 1 commit
- 修改内部系统访问地址 · b11e3029
  赵啸非 authored Nov 14, 2023
  
  b11e3029
13 Nov, 2023 1 commit
- 修改内部系统访问地址 · 25395ba8
  赵啸非 authored Nov 13, 2023
  
  25395ba8
08 Nov, 2023 2 commits
- Merge remote-tracking branch 'origin/master' · 38dee976
  赵啸非 authored Nov 08, 2023
  
  38dee976
- 修改记录 · 766f39d1
  赵啸非 authored Nov 08, 2023
  
  766f39d1
26 Oct, 2023 1 commit
- 钉钉相关接口 · 36bb65f3
  周亚武 authored Oct 26, 2023
  
  36bb65f3
20 Oct, 2023 3 commits
- 添加假日数据 · bfe873b7
  赵啸非 authored Oct 20, 2023
  
  bfe873b7
- 添加假日数据 · b0df6767
  赵啸非 authored Oct 20, 2023
  
  b0df6767
- 添加假日数据 · cb733573
  赵啸非 authored Oct 20, 2023
  
  cb733573
19 Oct, 2023 4 commits
- Merge remote-tracking branch 'origin/master' · aca30287
  赵啸非 authored Oct 19, 2023
  
  aca30287
- 添加假日数据 · b54cb22d
  赵啸非 authored Oct 19, 2023
  
  b54cb22d
- 钉钉相关接口 · 1b25416d
  周亚武 authored Oct 19, 2023
  
  1b25416d
- 钉钉相关接口-增加撤销审批完成状态 · b3ec8111
  周亚武 authored Oct 19, 2023
  
  b3ec8111
18 Oct, 2023 2 commits
- 添加假日数据 · 766376c8
  赵啸非 authored Oct 18, 2023
  
  766376c8
- 添加假日数据 · 420772e4
  赵啸非 authored Oct 18, 2023
  
  420772e4
12 Oct, 2023 2 commits
- Merge remote-tracking branch 'origin/master' · e411b7a5
  赵啸非 authored Oct 12, 2023
  
  e411b7a5
- 添加假日考勤计算 · 56770109
  赵啸非 authored Oct 12, 2023
  
  56770109
11 Oct, 2023 1 commit
- 考勤汇总任务增加特定节假日判断 · 440987d3
  廖旭伟 authored Oct 11, 2023
  
  440987d3
10 Oct, 2023 1 commit
- 添加假日数据 · 69ba9ebd
  赵啸非 authored Oct 10, 2023
  
  69ba9ebd
09 Oct, 2023 2 commits
- 添加假日数据 · b213bbcc
  赵啸非 authored Oct 09, 2023
  
  b213bbcc
- 添加假日数据 · efd210fe
  赵啸非 authored Oct 09, 2023
  
  efd210fe
22 Sep, 2023 2 commits
- Merge remote-tracking branch 'origin/master' · 5fae7a1d
  赵啸非 authored Sep 22, 2023
  
  5fae7a1d
- 添加考勤计算任务 · a4fed91e
  赵啸非 authored Sep 22, 2023
  
  a4fed91e