Commits · 767f6e95a81366a9924731553206a6c7021db974 · 赵啸非 / attendance-performance-platform

12 Apr, 2023 1 commit
- '提交' · 767f6e95
  dll authored Apr 12, 2023
  
  767f6e95
11 Apr, 2023 18 commits
- Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform · dddd0bca
  dll authored Apr 11, 2023
  
  dddd0bca
- 提交 4-11 接口未对 · 98d7c875
  dll authored Apr 11, 2023
  
  98d7c875
- 添加海康jar · b8c7d98c
  赵啸非 authored Apr 11, 2023
  
  b8c7d98c
- 修改员工职位字典 · 7593d6f3
  赵啸非 authored Apr 11, 2023
  
  7593d6f3
- 修改员工职位字典 · c066900a
  赵啸非 authored Apr 11, 2023
  
  c066900a
- 修改员工统计信息 · 0307763d
  daijunxiong authored Apr 11, 2023
  
  0307763d
- 考勤绩效负责人 · 563a7146
  dll authored Apr 11, 2023
  
  563a7146
- Merge remote-tracking branch 'origin/master' · 79aa82eb
  赵啸非 authored Apr 11, 2023
  
  79aa82eb
- 修改前端菜单 · 1464f6d0
  赵啸非 authored Apr 11, 2023
  
  1464f6d0
- 员工假期统计--个人花名册--假期员工信息统计 --- 在职/离职 · 020e1505
  daijunxiong authored Apr 11, 2023
  
  020e1505
- Merge remote-tracking branch 'origin/master' · c16365fd
  赵啸非 authored Apr 11, 2023
  
  c16365fd
- 添加员工职位字典数据 · 332e5796
  赵啸非 authored Apr 11, 2023
  
  332e5796
- 提交 · 468eee28
  dll authored Apr 11, 2023
  
  468eee28
- 提交 · 959b666f
  dll authored Apr 11, 2023
  
  959b666f
- 前端重构菜单选择，修改为树形结构 · ef1b9707
  赵啸非 authored Apr 11, 2023
  
  ef1b9707
- 前端重构菜单选择，修改为树形结构 · 4b33512e
  赵啸非 authored Apr 11, 2023
  
  4b33512e
- 前端重构菜单选择，修改为树形结构 · 29e85fe3
  赵啸非 authored Apr 11, 2023
  
  29e85fe3
- 前端重构菜单选择，修改为树形结构 · a6b04b19
  赵啸非 authored Apr 11, 2023
  
  a6b04b19
10 Apr, 2023 14 commits
- 前端重构菜单选择，修改为树形结构 · fa31c71d
  赵啸非 authored Apr 11, 2023
  
  fa31c71d
- 提交数据 · 2a384aa2
  dll authored Apr 10, 2023
  
  2a384aa2
- 提交 · ea4d804a
  dll authored Apr 10, 2023
  
  ea4d804a
- 4-10 · 430438cf
  dll authored Apr 10, 2023
  
  430438cf
- 提交 · b8053e6c
  dll authored Apr 10, 2023
  
  b8053e6c
- 前端添加菜单图标种类 · dfb0ca55
  赵啸非 authored Apr 10, 2023
  
  dfb0ca55
- 修改特殊配置字段实体类 · 9173472b
  赵啸非 authored Apr 10, 2023
  
  9173472b
- 枚举类修改 · 970816ee
  wenqy authored Apr 10, 2023
  
  970816ee
- 定时任务---员工部门信息 · 4cca406c
  daijunxiong authored Apr 10, 2023
```
员工花名册---统计数据为写死测试数据
```
  4cca406c
- 前端员工关怀添加了导入导出 · 707e5868
  赵啸非 authored Apr 10, 2023
  
  707e5868
- Merge remote-tracking branch 'origin/master' · 03c74975
  赵啸非 authored Apr 10, 2023
  
  03c74975
- 员工信息表--添加备注id · e5ceb40c
  zhangyi9527 authored Apr 10, 2023
  
  e5ceb40c
- 员工修改为缓存模式 · 0b7342f6
  赵啸非 authored Apr 10, 2023
  
  0b7342f6
- Merge remote-tracking branch 'origin/master' · 4b7fe4c3
  张家银 authored Apr 10, 2023
  
  4b7fe4c3
09 Apr, 2023 2 commits
- 提交 · 73e4b98c
  dll authored Apr 09, 2023
  
  73e4b98c
- 考勤打卡记录详细列表增加字段 · 02c9e3c7
  张家银 authored Apr 09, 2023
  
  02c9e3c7
08 Apr, 2023 5 commits
- 考勤组相关后端与前端代码添加 · a4d296ed
  赵啸非 authored Apr 08, 2023
  
  a4d296ed
- 文档修改 · 7078835d
  赵啸非 authored Apr 08, 2023
  
  7078835d
- 文档修改 · 4089fa2e
  赵啸非 authored Apr 08, 2023
  
  4089fa2e
- Merge remote-tracking branch 'origin/master' · 8af456e9
  赵啸非 authored Apr 08, 2023
```
# Conflicts:
#	attendance-performance-manager-ui/admin/src/views/staff/list.vue
```
  8af456e9
- 添加考勤汇总前后端等数据 · b86061e8
  赵啸非 authored Apr 08, 2023
  
  b86061e8