Commits · c3d388dd96cc7d780be87ef704fef6def2c868c3 · 项目统一框架 / amos-boot-biz · GitLab

21 Feb, 2022 27 commits
- 合并developer代码解决冲突 · c3d388dd
  maoying authored Feb 21, 2022
  
  c3d388dd
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · 1ad00a26
  maoying authored Feb 21, 2022
  
  1ad00a26
- 根据id获取设备详情接口添加qrcode返回 · 30caf87d
  maoying authored Feb 21, 2022
  
  30caf87d
- 修改bug · dacabc54
  chenzhao authored Feb 21, 2022
  
  dacabc54
- BUG 4617 · 9d5dee2f
  李腾威 authored Feb 21, 2022
  
  9d5dee2f
- 修改bug · 17afe10b
  tangwei authored Feb 21, 2022
  
  17afe10b
- Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs · ffa9c774
  chenhao authored Feb 21, 2022
  
  ffa9c774
- 修改bug :4725 · 3c8a0235
  chenhao authored Feb 21, 2022
  
  3c8a0235
- 前端传递空值，MyBatis Plus updateById方法更新不了null · 8b9b4f45
  chenzhao authored Feb 21, 2022
  
  8b9b4f45
- 修改bug 4827 · b621e1e2
  chenhao authored Feb 21, 2022
  
  b621e1e2
- 解决水源信息中excle导入没有装备code 的问题 · 8baa6b2a
  chenhao authored Feb 21, 2022
  
  8baa6b2a
- 完成需求bug ：4803 · bf981480
  chenhao authored Feb 21, 2022
  
  bf981480
- Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs · 98a03eff
  chenhao authored Feb 21, 2022
  
  98a03eff
- 修改bug 4827 · 3e76afd6
  chenhao authored Feb 21, 2022
  
  3e76afd6
- 1.装备定义code字段使用错误 · 50bf53b8
  suhuiguang authored Feb 21, 2022
  
  50bf53b8
- 1.新的告警插入时，设备的所在系统、设备名称、装备定义名称进行更新 · 6dec50ea
  suhuiguang authored Feb 21, 2022
  
  6dec50ea
- 修改BUG · 581ef588
  李腾威 authored Feb 21, 2022
  
  581ef588
- 修改bug · 79d913fa
  chenzhao authored Feb 21, 2022
  
  79d913fa
- 1.消防系统编辑数据同步sql报错 · e26568e8
  suhuiguang authored Feb 21, 2022
  
  e26568e8
- 1.消防字体编辑数据同步报错 · 3b96edd7
  suhuiguang authored Feb 21, 2022
  
  3b96edd7
- Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs · 8f98585a
  tangwei authored Feb 21, 2022
  
  8f98585a
- 切换服务器修改配置 · 97ea10a1
  tangwei authored Feb 21, 2022
  
  97ea10a1
- 修改bug · aba27531
  chenzhao authored Feb 21, 2022
  
  aba27531
- BUG 4728 · 7e9a4d0d
  chenzhao authored Feb 21, 2022
  
  7e9a4d0d
- Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs · 4db8b537
  chenhao authored Feb 21, 2022
  
  4db8b537
- Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs · 10e3eebf
  chenhao authored Feb 21, 2022
  
  10e3eebf
- 配置文件中维护消防救援保障部Id · b5c0ccd1
  chenzhao authored Feb 21, 2022
  
  b5c0ccd1
18 Feb, 2022 13 commits
- 重复地址及接口删除多余 · c02647f3
  chenzhao authored Feb 18, 2022
  
  c02647f3
- 1.修复bug，火爆3小，声光报警器数量统计不正确 · 8532719e
  suhuiguang authored Feb 18, 2022
  
  8532719e
- 修改bug · 90675df3
  chenzhao authored Feb 18, 2022
  
  90675df3
- 修改重点部位根据建筑id查询脚本 · 519e94e1
  maoying authored Feb 18, 2022
  
  519e94e1
- 解决冲突 · 76b37a4d
  maoying authored Feb 18, 2022
  
  76b37a4d
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · 060a9a98
  maoying authored Feb 18, 2022
  
  060a9a98
- 修改巡检点添加重点部位检查项列表数据查询问题 · d70de8c1
  maoying authored Feb 18, 2022
  
  d70de8c1
- 1.设备编辑调整所属系统后新增插入的告警日志系统未原来的bug修改 · afc60d68
  suhuiguang authored Feb 18, 2022
  
  afc60d68
- 修改bug · fad02218
  chenzhao authored Feb 18, 2022
  
  fad02218
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · 02725513
  maoying authored Feb 18, 2022
  
  02725513
- 修改组态图指标内容显示 · 569572b8
  maoying authored Feb 18, 2022
  
  569572b8
- 修改bug · b3445951
  tangwei authored Feb 18, 2022
  
  b3445951
- Merge branch 'developer' into develop_ccs · 97643eb3
  tangwei authored Feb 18, 2022
  
  97643eb3