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

12 Mar, 2025 1 commit
- 根据客户要求将考勤统计所有请假类型统计结果调整为一致 · 3f3d83f4
  廖旭伟 authored Mar 12, 2025
  
  3f3d83f4
26 Jun, 2024 1 commit
- 屏蔽异常处理列表字段 · 2d7bbd75
  姬鋆屾 authored Jun 26, 2024
  
  2d7bbd75
13 Dec, 2023 1 commit
- 修改员工格式化 · 09db9fcb
  赵啸非 authored Dec 13, 2023
  
  09db9fcb
04 Dec, 2023 12 commits
- 修改redis认证方式 · 73ae1bac
  赵啸非 authored Dec 04, 2023
  
  73ae1bac
- 修改redis认证方式 · 56c9e167
  赵啸非 authored Dec 04, 2023
  
  56c9e167
- Merge branch 'master' into reg · 055cc65f
  赵啸非 authored Dec 04, 2023
```
# Conflicts:
#	attendance-performance-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java
```
  055cc65f
- 修改redis认证方式 · a8eff47c
  赵啸非 authored Dec 04, 2023
  
  a8eff47c
- 修改redis认证方式 · 1d2839df
  赵啸非 authored Dec 04, 2023
  
  1d2839df
- 修改redis认证方式 · 6e3fc520
  赵啸非 authored Dec 04, 2023
  
  6e3fc520
- Merge remote-tracking branch 'origin/master' · 78e96ed9
  赵啸非 authored Dec 04, 2023
  
  78e96ed9
- 修改redis认证方式 · 09d32c02
  赵啸非 authored Dec 04, 2023
  
  09d32c02
- 修改redis认证方式 · 00a3a4da
  赵啸非 authored Dec 04, 2023
  
  00a3a4da
- 考勤汇总导出excel表格优化 · efcf8cd1
  廖旭伟 authored Dec 04, 2023
  
  efcf8cd1
- Merge remote-tracking branch 'origin/master' · 3a44e978
  赵啸非 authored Dec 04, 2023
  
  3a44e978
- 修改redis认证方式 · b61cd627
  赵啸非 authored Dec 04, 2023
  
  b61cd627
03 Dec, 2023 1 commit
- tui · 28511dae
  姬鋆屾 authored Dec 03, 2023
  
  28511dae
01 Dec, 2023 7 commits
- Merge remote-tracking branch 'origin/master' · f6c4dafd
  廖旭伟 authored Dec 01, 2023
  
  f6c4dafd
- 考勤汇总导出excel表格优化 · a7989436
  廖旭伟 authored Dec 01, 2023
  
  a7989436
- tui · d2919b82
  姬鋆屾 authored Dec 01, 2023
  
  d2919b82
- Merge remote-tracking branch 'origin/master' · 76b4c858
  赵啸非 authored Dec 01, 2023
  
  76b4c858
- 修改redis认证方式 · 4fef9d6e
  赵啸非 authored Dec 01, 2023
  
  4fef9d6e
- 用户列表增加角色回显 · ddeb8d29
  廖旭伟 authored Dec 01, 2023
  
  ddeb8d29
- 推，修改绩效汇总详细 · c923a676
  姬鋆屾 authored Dec 01, 2023
  
  c923a676
30 Nov, 2023 5 commits
- Merge remote-tracking branch 'origin/master' · 4e66009b
  廖旭伟 authored Nov 30, 2023
  
  4e66009b
- 考勤汇总导出结果列顺序修改 · b5a78fab
  廖旭伟 authored Nov 30, 2023
  
  b5a78fab
- 修改redis认证方式 · d3378530
  赵啸非 authored Nov 30, 2023
  
  d3378530
- Merge remote-tracking branch 'origin/master' · a538cd45
  赵啸非 authored Nov 30, 2023
  
  a538cd45
- 修改redis认证方式 · be0084ba
  赵啸非 authored Nov 30, 2023
  
  be0084ba
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 9 commits
- 添加考勤逻辑判断 · 7744c1b3
  赵啸非 authored Nov 28, 2023
  
  7744c1b3
- 添加考勤逻辑判断 · f470cd4b
  赵啸非 authored Nov 28, 2023
  
  f470cd4b
- 添加考勤逻辑判断 · 335b6269
  赵啸非 authored Nov 28, 2023
  
  335b6269
- 添加考勤逻辑判断 · 8f40faaf
  赵啸非 authored Nov 28, 2023
  
  8f40faaf
- 绩效核查确实时将核查时间改为绩效扣分发生时间 · eada306d
  廖旭伟 authored Nov 28, 2023
  
  eada306d
- 添加考勤逻辑判断 · 3f8b5c82
  赵啸非 authored Nov 28, 2023
  
  3f8b5c82
- 添加考勤逻辑判断 · 38953635
  赵啸非 authored Nov 28, 2023
  
  38953635
- 添加考勤逻辑判断 · d411ac8e
  赵啸非 authored Nov 28, 2023
  
  d411ac8e
- 添加考勤逻辑判断 · 2005e653
  赵啸非 authored Nov 28, 2023
  
  2005e653