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

18 Feb, 2022 5 commits
- 1.设备编辑调整所属系统后新增插入的告警日志系统未原来的bug修改 · afc60d68
  suhuiguang authored Feb 18, 2022
  
  afc60d68
- 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
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · edc05407
  KeYong authored Feb 18, 2022
  
  edc05407
- 修改CAFS组态页面配置SQL · f9e9d21e
  KeYong authored Feb 18, 2022
  
  f9e9d21e
17 Feb, 2022 8 commits
- BUG 4079 · 27c1efa9
  李腾威 authored Feb 17, 2022
  
  27c1efa9
- 修复特种设备BUG · 6d71e1c0
  kongfm authored Feb 17, 2022
  
  6d71e1c0
- Merge remote-tracking branch 'origin/developer' into developer · e434e9df
  KeYong authored Feb 17, 2022
```
# Conflicts:
#	amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
```
  e434e9df
- 更新 · 0e4e056d
  KeYong authored Feb 17, 2022
  
  0e4e056d
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · c5104275
  maoying authored Feb 17, 2022
  
  c5104275
- 优化报警脚本查询语法 · 271af9fd
  maoying authored Feb 17, 2022
  
  271af9fd
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · ff9f804a
  KeYong authored Feb 17, 2022
  
  ff9f804a
- 修改bug · 48ec731f
  KeYong authored Feb 17, 2022
  
  48ec731f
16 Feb, 2022 11 commits
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · 65534e57
  maoying authored Feb 16, 2022
  
  65534e57
- 优化告警列表脚本 · fa7a6e09
  maoying authored Feb 16, 2022
  
  fa7a6e09
- Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer · c2601baa
  suhuiguang authored Feb 16, 2022
  
  c2601baa
- 1.确警页面详情显示最新一条告警信息 · c2372b1f
  suhuiguang authored Feb 16, 2022
  
  c2372b1f
- 格式化 · a96d5fcd
  maoying authored Feb 16, 2022
  
  a96d5fcd
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · f351caa0
  maoying authored Feb 16, 2022
  
  f351caa0
- 修改确警框告警详情位置 · 47bf4803
  maoying authored Feb 16, 2022
  
  47bf4803
- 修复特种设备BUG · 8cbcd1c9
  kongfm authored Feb 16, 2022
  
  8cbcd1c9
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · 4be7e743
  maoying authored Feb 16, 2022
  
  4be7e743
- 修改风险危险因素巡检点及设备指标异常后频率计算异常 · b7b78cb6
  maoying authored Feb 16, 2022
  
  b7b78cb6
- 1.跑缪系统断路器统计不对 · 7580d5d3
  suhuiguang authored Feb 16, 2022
  
  7580d5d3
15 Feb, 2022 2 commits
- 修复特种设备相关BUG · 8ea12711
  kongfm authored Feb 15, 2022
  
  8ea12711
- 1.视图修改连接为空bug · 219b997b
  suhuiguang authored Feb 15, 2022
  
  219b997b
14 Feb, 2022 3 commits
- 修改事件数据转换错误 · 1ab64856
  高东东 authored Feb 14, 2022
  
  1ab64856
- BUG 4642 4562 · b7b25706
  李腾威 authored Feb 14, 2022
  
  b7b25706
- 修改bug · 58fac5a6
  chenzhao authored Feb 14, 2022
  
  58fac5a6
11 Feb, 2022 9 commits
- 更新报错提示 · ef238c0a
  kongfm authored Feb 11, 2022
  
  ef238c0a
- 根据建筑筛选 · 117e47c4
  chenzhao authored Feb 11, 2022
  
  117e47c4
- 列表告警位置拼接详细地址 · 7e9e8f3f
  chenzhao authored Feb 11, 2022
  
  7e9e8f3f
- 修改事件监听bug · efed5a29
  高东东 authored Feb 11, 2022
  
  efed5a29
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · 48d243d3
  KeYong authored Feb 11, 2022
  
  48d243d3
- 修改bug · 8a6ad56b
  KeYong authored Feb 11, 2022
  
  8a6ad56b
- Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer · f19d5a6b
  tangwei authored Feb 11, 2022
  
  f19d5a6b
- 修改bug · 985b1ef7
  tangwei authored Feb 11, 2022
  
  985b1ef7
- 提交巡检配置 · dc50570f
  KeYong authored Feb 11, 2022
  
  dc50570f
10 Feb, 2022 2 commits
- 修复bug · d36f66f2
  KeYong authored Feb 10, 2022
  
  d36f66f2
- Merge remote-tracking branch 'origin/developer' into developer · 276264e0
  kongfm authored Feb 10, 2022
  
  276264e0