Commits · 61db080fc6c720068bc425ee715845acd4362908 · 耿迪迪 / zhengyuan-danger-chemistry-manage

24 Dec, 2022 11 commits
- Merge remote-tracking branch 'origin/master' · 61db080f
  吴卿华 authored Dec 24, 2022
  
  61db080f
- Merge remote-tracking branch 'origin/master' · 31cb06b0
  zhangjianqian authored Dec 24, 2022
  
  31cb06b0
- 我的课程，展示区分培训和考试 · f3388698
  zhangjianqian authored Dec 24, 2022
  
  f3388698
- Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage · bda96b8a
  耿迪迪 authored Dec 24, 2022
  
  bda96b8a
- 考试发布 gengdidi · 3533c39c
  耿迪迪 authored Dec 24, 2022
  
  3533c39c
- Merge remote-tracking branch 'origin/master' · af8dbe6f
  王晓倩 authored Dec 24, 2022
  
  af8dbe6f
- 安全承诺公告新增验证，详情页布局 · 133d6f6e
  王晓倩 authored Dec 24, 2022
  
  133d6f6e
- Merge remote-tracking branch 'origin/master' · af805e00
  zhangjianqian authored Dec 24, 2022
  
  af805e00
- 调整样式，添加培训人员类型 · d4f8ca93
  zhangjianqian authored Dec 24, 2022
  
  d4f8ca93
- Merge remote-tracking branch 'origin/master' · 42bf5575
  王晓倩 authored Dec 24, 2022
  
  42bf5575
- 安全承诺公告 · 9ba4f77d
  王晓倩 authored Dec 24, 2022
  
  9ba4f77d
23 Dec, 2022 2 commits
- 培训计划，添加承包商字段 · d1e3491e
  zhangjianqian authored Dec 23, 2022
  
  d1e3491e
- 培训计划管理，修改 · 27762a83
  zhangjianqian authored Dec 23, 2022
  
  27762a83
22 Dec, 2022 5 commits
- Merge remote-tracking branch 'origin/master' · e58998c5
  吴卿华 authored Dec 22, 2022
```
# Conflicts:
#	danger-manage-web/vue.config.js
```
  e58998c5
- Merge branch 'master' of D:\项目\正元安全生产\zhengyuan-danger-chemistry-manage with conflicts. · 1757b94f
  吴卿华 authored Dec 22, 2022
  
  1757b94f
- 承包商所有人接口 gengdidi · 5caa8611
  耿迪迪 authored Dec 22, 2022
  
  5caa8611
- 考试统计 gengdidi · bcd9ce83
  耿迪迪 authored Dec 22, 2022
  
  bcd9ce83
- 考试接口问题修改 gengdidi · e7b9c75b
  耿迪迪 authored Dec 22, 2022
  
  e7b9c75b
21 Dec, 2022 8 commits
- 配置还原 gengdidi · 0b3bcb91
  耿迪迪 authored Dec 21, 2022
  
  0b3bcb91
- Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage · e6054bd7
  耿迪迪 authored Dec 21, 2022
  
  e6054bd7
- 考试统计接口 gengdidi · 93409e5b
  耿迪迪 authored Dec 21, 2022
  
  93409e5b
- 提交合并 · 8708b05c
  纪泽龙 authored Dec 21, 2022
  
  8708b05c
- 考试统计 gengdidi · 3a67c4ec
  耿迪迪 authored Dec 21, 2022
  
  3a67c4ec
- 制作考试人员选择的组件 · fa399a4b
  纪泽龙 authored Dec 21, 2022
  
  fa399a4b
- 培训修改，新增承包商培训类型 · fed02cbc
  zhangjianqian authored Dec 21, 2022
  
  fed02cbc
- 隐患修改，教育培训修改 · 375fa540
  zhangjianqian authored Dec 21, 2022
  
  375fa540
20 Dec, 2022 2 commits
- Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage · 90c14366
  耿迪迪 authored Dec 20, 2022
  
  90c14366
- 考试接口 gengdidi · ce82bcd4
  耿迪迪 authored Dec 20, 2022
  
  ce82bcd4
19 Dec, 2022 6 commits
- Merge remote-tracking branch 'origin/master' · c79f6cf8
  zhangjianqian authored Dec 19, 2022
  
  c79f6cf8
- 隐患详情修改 · 072a1385
  zhangjianqian authored Dec 19, 2022
  
  072a1385
- 项目配置恢复 gengdidi · e2d335e7
  耿迪迪 authored Dec 19, 2022
  
  e2d335e7
- redis项目配置修改 gengdidi · 73e9daaa
  耿迪迪 authored Dec 19, 2022
  
  73e9daaa
- Merge remote-tracking branch 'origin/master' · 14227427
  zhangjianqian authored Dec 19, 2022
  
  14227427
- 隐患修改 · 7070bd76
  zhangjianqian authored Dec 19, 2022
  
  7070bd76
17 Dec, 2022 3 commits
- iginore · 9b9c355e
  耿迪迪 authored Dec 17, 2022
  
  9b9c355e
- 虹软jar · 0829e154
  耿迪迪 authored Dec 17, 2022
  
  0829e154
- 修改题库的Dia内部的属性名开始之前 · 12b3a02a
  纪泽龙 authored Dec 17, 2022
  
  12b3a02a
16 Dec, 2022 2 commits
- 人脸识别接口 gengdidi · 5adbbb36
  耿迪迪 authored Dec 16, 2022
  
  5adbbb36
- 题库管理页面的增加删除修改。 · f7b9295f
  纪泽龙 authored Dec 16, 2022
  
  f7b9295f
15 Dec, 2022 1 commit
- Merge branch 'master' into jzl · a40306a3
  纪泽龙 authored Dec 15, 2022
  
  a40306a3