Commits · 25db61b2826bcdc1310607ee33b21bd6e2a4321c · 赵啸非 / attendance-performance-platform

22 Nov, 2023 3 commits
- 添加海康门禁设备管理 · 25db61b2
  赵啸非 authored Nov 22, 2023
  
  25db61b2
- 修改若尔盖 · c5a15917
  赵啸非 authored Nov 22, 2023
  
  c5a15917
- Merge branch 'master' into 'reg' · da2a72f6
  赵啸非 authored Nov 22, 2023
```
Master

See merge request !1
```
  da2a72f6
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
14 Sep, 2023 6 commits
- 假期汇总默认假期改为其他假 · 3496333d
  廖旭伟 authored Sep 14, 2023
  
  3496333d
- 钉钉相关接口 · 009b76d1
  周亚武 authored Sep 14, 2023
  
  009b76d1
- 钉钉相关接口 · 6140ea6b
  周亚武 authored Sep 14, 2023
  
  6140ea6b
- 钉钉相关接口 · 6a15ee31
  周亚武 authored Sep 14, 2023
  
  6a15ee31
- 钉钉相关接口-修复请假理由BUG · 2833c654
  周亚武 authored Sep 14, 2023
  
  2833c654
- 钉钉相关接口-修复请假事由设置BUG · 98e54ced
  周亚武 authored Sep 14, 2023
  
  98e54ced
13 Sep, 2023 1 commit
- tui · ad019a1b
  姬鋆屾 authored Sep 13, 2023
  
  ad019a1b
12 Sep, 2023 2 commits
- 钉钉相关接口--请假记录导出优化 · 760c3aef
  周亚武 authored Sep 12, 2023
  
  760c3aef
- tui · cde31c1e
  姬鋆屾 authored Sep 12, 2023
  
  cde31c1e
11 Sep, 2023 1 commit
- Merge remote-tracking branch 'origin/master' · e7ff8e04
  赵啸非 authored Sep 11, 2023
  
  e7ff8e04