Commits · 5cbd1a4e1a2e11d04e9ce944a721c477613febdd · 赵啸非 / attendance-performance-platform

09 Oct, 2024 6 commits
- 整理代码 · 5cbd1a4e
  赵啸非 authored Oct 09, 2024
  
  5cbd1a4e
- 整理代码 · efbfc1b2
  赵啸非 authored Oct 09, 2024
  
  efbfc1b2
- 整理代码 · 8adc964e
  赵啸非 authored Oct 09, 2024
  
  8adc964e
- Merge remote-tracking branch 'origin/master' · 21341d07
  赵啸非 authored Oct 09, 2024
  
  21341d07
- 整理代码 · c8583e92
  赵啸非 authored Oct 09, 2024
  
  c8583e92
- 考勤汇总修改离职判断逻辑，不再计算离职日期 · ea0a26e7
  廖旭伟 authored Oct 09, 2024
  
  ea0a26e7
08 Oct, 2024 13 commits
- 修改考勤汇总情况描述 · abb3f7cf
  廖旭伟 authored Oct 08, 2024
  
  abb3f7cf
- 整理代码 · 0b5188d1
  赵啸非 authored Oct 08, 2024
  
  0b5188d1
- Merge remote-tracking branch 'origin/master' · b3de2e8a
  赵啸非 authored Oct 08, 2024
  
  b3de2e8a
- 整理代码 · 7b3276e7
  赵啸非 authored Oct 08, 2024
  
  7b3276e7
- Merge remote-tracking branch 'origin/master' · 9bbb3038
  廖旭伟 authored Oct 08, 2024
  
  9bbb3038
- 取消编辑人员信息时将来源改为自定义 · 04d19eec
  廖旭伟 authored Oct 08, 2024
  
  04d19eec
- 整理代码 · b50d5da0
  赵啸非 authored Oct 08, 2024
  
  b50d5da0
- Merge remote-tracking branch 'origin/master' · 1508c2be
  赵啸非 authored Oct 08, 2024
  
  1508c2be
- 整理代码 · 0046f601
  赵啸非 authored Oct 08, 2024
  
  0046f601
- Merge remote-tracking branch 'origin/master' · 7d593584
  廖旭伟 authored Oct 08, 2024
  
  7d593584
- 修改考勤汇总情况描述 · c1cb347d
  廖旭伟 authored Oct 08, 2024
  
  c1cb347d
- 整理代码 · c5722674
  赵啸非 authored Oct 08, 2024
  
  c5722674
- 整理代码 · 9f7cb378
  赵啸非 authored Oct 08, 2024
  
  9f7cb378
26 Sep, 2024 8 commits
- 修改考勤汇总查询 · bb22c6c4
  赵啸非 authored Sep 26, 2024
  
  bb22c6c4
- 修改考勤汇总查询 · 00367280
  赵啸非 authored Sep 26, 2024
  
  00367280
- 修改考勤汇总查询 · edb46975
  赵啸非 authored Sep 26, 2024
  
  edb46975
- 修改考勤汇总查询 · dd76168d
  赵啸非 authored Sep 26, 2024
  
  dd76168d
- 修改考勤汇总查询 · fcba0641
  赵啸非 authored Sep 26, 2024
  
  fcba0641
- 修改考勤汇总查询 · 92eb91f2
  赵啸非 authored Sep 26, 2024
  
  92eb91f2
- 修改考勤汇总查询 · dced5498
  赵啸非 authored Sep 26, 2024
  
  dced5498
- 修改考勤汇总查询 · 8bf6993f
  赵啸非 authored Sep 26, 2024
  
  8bf6993f
24 Sep, 2024 2 commits
- 修改考勤汇总查询 · 5c2ce90c
  赵啸非 authored Sep 24, 2024
  
  5c2ce90c
- 修改考勤汇总查询 · 5021366a
  赵啸非 authored Sep 24, 2024
  
  5021366a
23 Sep, 2024 3 commits
- 修改考勤汇总查询 · df5d77a7
  赵啸非 authored Sep 23, 2024
  
  df5d77a7
- Merge remote-tracking branch 'origin/master' · 47ce4bfd
  赵啸非 authored Sep 23, 2024
  
  47ce4bfd
- 修改考勤汇总查询 · a92bc044
  赵啸非 authored Sep 23, 2024
  
  a92bc044
19 Sep, 2024 1 commit
- fixed：修改考勤授权不生效的问题及接口传参调整；屏蔽员工列表的编辑功能 · 18f4ff4a
  姬鋆屾 authored Sep 19, 2024
  
  18f4ff4a
13 Sep, 2024 7 commits
- 考勤汇总更新时间记录 · d5f9de19
  廖旭伟 authored Sep 13, 2024
  
  d5f9de19
- 请假通过后重新汇总考勤 · 71bdacc7
  廖旭伟 authored Sep 13, 2024
  
  71bdacc7
- 每日考勤自动汇总任务汇总日期范围改为最近10天 · 0c014de7
  廖旭伟 authored Sep 13, 2024
  
  0c014de7
- Merge remote-tracking branch 'origin/master' · 244dea1b
  廖旭伟 authored Sep 13, 2024
```
# Conflicts:
#	attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStaffStatServiceImpl.java
```
  244dea1b
- 考勤汇总查询bug修改 · 8ecddc09
  廖旭伟 authored Sep 13, 2024
  
  8ecddc09
- Merge remote-tracking branch 'origin/master' · 020c6a58
  赵啸非 authored Sep 13, 2024
  
  020c6a58
- 修改考勤汇总查询 · 420375c8
  赵啸非 authored Sep 13, 2024
  
  420375c8