Commits · d8492b0752d64ab30039e223781e9cc2afd08c9c · 耿迪迪 / zhengyuan-danger-chemistry-manage

28 Dec, 2022 5 commits
- 更改参数 · d8492b07
  zhangjianqian authored Dec 28, 2022
  
  d8492b07
- Merge branch 'jzl' · 2a7346df
  纪泽龙 authored Dec 28, 2022
  
  2a7346df
- 试卷管理完成 · 1ee8f76b
  纪泽龙 authored Dec 28, 2022
  
  1ee8f76b
- 考试发布问题修改 gengdidi · ac7a59f7
  耿迪迪 authored Dec 28, 2022
  
  ac7a59f7
- 访客供应商 · b8757114
  yaqizhang authored Dec 28, 2022
  
  b8757114
27 Dec, 2022 9 commits
- 访客和承包商培训 · e8be22bb
  yaqizhang authored Dec 27, 2022
  
  e8be22bb
- 考试试题数量 gengdidi · fffe6732
  耿迪迪 authored Dec 27, 2022
  
  fffe6732
- redis 配置修改 gengdidi · f4d5ba2a
  耿迪迪 authored Dec 27, 2022
  
  f4d5ba2a
- Merge branch 'jzl' · e1d166b3
  纪泽龙 authored Dec 27, 2022
  
  e1d166b3
- 试卷 · 6ba61b3a
  纪泽龙 authored Dec 27, 2022
  
  6ba61b3a
- Merge remote-tracking branch 'origin/master' · 1982805d
  zhangjianqian authored Dec 27, 2022
  
  1982805d
- 小程序隐患排查任务 · 0c4f2337
  zhangjianqian authored Dec 27, 2022
  
  0c4f2337
- 承包商及访客培训 gengdidi · da29a3f9
  耿迪迪 authored Dec 27, 2022
  
  da29a3f9
- 从题库批量新增 gengdidi · f62d76ec
  耿迪迪 authored Dec 27, 2022
  
  f62d76ec
25 Dec, 2022 6 commits
- Merge remote-tracking branch 'origin/master' · e867b9be
  吴卿华 authored Dec 25, 2022
```
# Conflicts:
#	danger-manage-admin/src/main/java/com/zehong/web/controller/system/TBankSubjectController.java
```
  e867b9be
- 导入修改 · 830bd15e
  吴卿华 authored Dec 25, 2022
  
  830bd15e
- Merge branch 'jzl' · 5729a17f
  纪泽龙 authored Dec 25, 2022
  
  5729a17f
- 更新一下 · 88a9f88c
  纪泽龙 authored Dec 25, 2022
  
  88a9f88c
- 课程类型改为培训计划 · fc2b1ce8
  lizhichao authored Dec 25, 2022
  
  fc2b1ce8
- 安全承诺添加默认值 · 310730a9
  lizhichao authored Dec 25, 2022
  
  310730a9
24 Dec, 2022 13 commits
- 没用实体类剔除 gengdidi · 9c9dd88e
  耿迪迪 authored Dec 24, 2022
  
  9c9dd88e
- 化工巡检 · aa08a383
  吴卿华 authored Dec 24, 2022
  
  aa08a383
- 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