Commits · df5d77a7db2645b31f9739df9b407dd53859c03b · 赵啸非 / attendance-performance-platform

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 9 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
- 每日打卡记录导出时间跨度限制改为一个月 · 993cd877
  廖旭伟 authored Sep 13, 2024
  
  993cd877
- Merge remote-tracking branch 'origin/master' · a020d5af
  廖旭伟 authored Sep 13, 2024
  
  a020d5af
12 Sep, 2024 1 commit
- 修改考勤汇总查询 · 9962a0fe
  赵啸非 authored Sep 12, 2024
  
  9962a0fe
11 Sep, 2024 2 commits
- Merge remote-tracking branch 'origin/master' · 4976d844
  廖旭伟 authored Sep 11, 2024
  
  4976d844
- 考勤异常处理增加年假类型 · ed43d9a9
  廖旭伟 authored Sep 11, 2024
  
  ed43d9a9
10 Sep, 2024 5 commits
- 修改考勤汇总查询 · 8df15e0b
  赵啸非 authored Sep 10, 2024
  
  8df15e0b
- 修改考勤汇总查询 · 6e5b8e67
  赵啸非 authored Sep 10, 2024
  
  6e5b8e67
- 修改考勤汇总查询 · b4be6fdc
  赵啸非 authored Sep 10, 2024
  
  b4be6fdc
- Merge remote-tracking branch 'origin/master' · d6e050c9
  赵啸非 authored Sep 10, 2024
  
  d6e050c9
- 修改考勤汇总查询 · 1c65e75f
  赵啸非 authored Sep 10, 2024
  
  1c65e75f
04 Sep, 2024 7 commits
- feated:优化实到数据展示 · 76389642
  姬鋆屾 authored Sep 04, 2024
  
  76389642
- feated:优化考勤汇总不同状态展示颜色 · fb2b1bfb
  姬鋆屾 authored Sep 04, 2024
  
  fb2b1bfb
- Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform · 623fac14
  姬鋆屾 authored Sep 04, 2024
  
  623fac14
- feated:优化考勤汇总查询筛选 · 4b1cba4f
  姬鋆屾 authored Sep 04, 2024
  
  4b1cba4f
- 修改考勤汇总查询 · ae529035
  赵啸非 authored Sep 04, 2024
  
  ae529035
- Merge remote-tracking branch 'origin/master' · 6a371aa3
  赵啸非 authored Sep 04, 2024
  
  6a371aa3
- 修改统计查询结果 · a1012d86
  赵啸非 authored Sep 04, 2024
  
  a1012d86
03 Sep, 2024 3 commits
- feated:优化考勤汇总查询筛选 · 3b8fab81
  姬鋆屾 authored Sep 03, 2024
  
  3b8fab81
- fixed:修改考勤时间工作日设置的展示样式 · e5c96af7
  姬鋆屾 authored Sep 03, 2024
  
  e5c96af7
- feated:优化考勤汇总不同状态展示 · d67d44c4
  姬鋆屾 authored Sep 03, 2024
  
  d67d44c4
30 Aug, 2024 3 commits
- 修改请假计算考勤 · b258a9f2
  赵啸非 authored Aug 30, 2024
  
  b258a9f2
- 修改请假计算考勤 · 6bcb80aa
  赵啸非 authored Aug 30, 2024
  
  6bcb80aa
- 修改请假计算考勤 · 79a8dbbe
  赵啸非 authored Aug 30, 2024
  
  79a8dbbe
22 Aug, 2024 1 commit
- 修改请假计算考勤 · 316d69dd
  赵啸非 authored Aug 22, 2024
  
  316d69dd
21 Aug, 2024 2 commits
- 修改请假计算考勤 · aaf8abe9
  赵啸非 authored Aug 21, 2024
  
  aaf8abe9
- 修改请假计算考勤 · 407ea516
  赵啸非 authored Aug 21, 2024
  
  407ea516
20 Aug, 2024 3 commits
- 修改请假计算考勤 · 323061b0
  赵啸非 authored Aug 20, 2024
  
  323061b0
- 修改请假计算考勤 · bf74e50e
  赵啸非 authored Aug 20, 2024
  
  bf74e50e
- 修改请假计算考勤 · 8fd1ba6e
  赵啸非 authored Aug 20, 2024
  
  8fd1ba6e