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

03 Feb, 2023 3 commits
- item：稳压泵诊断分析接口修改 · e42c19db
  高建强 authored Feb 03, 2023
  
  e42c19db
- item：稳压泵诊断分析接口修改 · fbbe7b46
  高建强 authored Feb 03, 2023
  
  fbbe7b46
- item：稳压泵诊断分析接口新增 · 5b82d50b
  高建强 authored Feb 03, 2023
  
  5b82d50b
02 Feb, 2023 3 commits
- item：稳压泵启停状态图接口剔除iotCode为空 · 037212d2
  高建强 authored Feb 02, 2023
  
  037212d2
- item：稳压泵启停状态图接口新增 · 28465f81
  高建强 authored Feb 02, 2023
  
  28465f81
- 合并冲突添加分支说明 · 2e33a4d3
  maoying authored Feb 02, 2023
  
  2e33a4d3
16 Jan, 2023 1 commit
- 四横八纵稳压泵启停指标修改 · 839bb6b3
  tianyiming authored Jan 16, 2023
  
  839bb6b3
15 Jan, 2023 4 commits
- 四横八纵稳压泵启停间隔时间bug修改 · efcfbd62
  tianyiming authored Jan 15, 2023
  
  efcfbd62
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · c4d0af46
  KeYong authored Jan 15, 2023
  
  c4d0af46
- 更新后端液位转换 · 042906a7
  KeYong authored Jan 15, 2023
  
  042906a7
- 修改bug · a42722d0
  lisong authored Jan 15, 2023
  
  a42722d0
14 Jan, 2023 14 commits
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · a262e8d1
  KeYong authored Jan 14, 2023
  
  a262e8d1
- 更新 · ab186e35
  KeYong authored Jan 14, 2023
  
  ab186e35
- item：值班接口提交 · cb363e79
  高建强 authored Jan 14, 2023
  
  cb363e79
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 7c691726
  KeYong authored Jan 14, 2023
  
  7c691726
- 更新 · 1528e0f8
  KeYong authored Jan 14, 2023
  
  1528e0f8
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · 6ee92a26
  xixinzhao authored Jan 14, 2023
  
  6ee92a26
- 知识库卡片接口修改 · 918eb87f
  xixinzhao authored Jan 14, 2023
  
  918eb87f
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · db12d7e1
  KeYong authored Jan 14, 2023
  
  db12d7e1
- 数据格式修改 · 3bef09d7
  KeYong authored Jan 14, 2023
  
  3bef09d7
- item：新增获取指定日期值班人员列表 · f0fbd048
  高建强 authored Jan 14, 2023
  
  f0fbd048
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · b8cee47e
  高建强 authored Jan 14, 2023
  
  b8cee47e
- 四横八纵本月稳压泵启停次数统计bug修改 · 10eb3466
  tianyiming authored Jan 14, 2023
  
  10eb3466
- item：新增获取指定日期值班人员统计 · 023db654
  高建强 authored Jan 14, 2023
  
  023db654
- 四横八纵稳压泵启停列表统计修改 · b7d61f76
  tianyiming authored Jan 14, 2023
  
  b7d61f76
13 Jan, 2023 6 commits
- item：初始化四横八纵shbz_img图片属性字段脚本维护 · 06c11982
  高建强 authored Jan 13, 2023
  
  06c11982
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · b47aec23
  maoying authored Jan 13, 2023
  
  b47aec23
- 修改知识库接口返回 · bb3d833e
  maoying authored Jan 13, 2023
  
  bb3d833e
- item：初始化四横八纵shbz_img图片属性字段脚本维护 · 543abe9d
  高建强 authored Jan 13, 2023
  
  543abe9d
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · be9563a8
  KeYong authored Jan 13, 2023
  
  be9563a8
- 调整告警统计接口 · 464e21e0
  KeYong authored Jan 13, 2023
  
  464e21e0
12 Jan, 2023 6 commits
- item：修改分组属性 · d4721d3a
  高建强 authored Jan 12, 2023
  
  d4721d3a
- 修改物联报表bug · b0a819f8
  lisong authored Jan 12, 2023
  
  b0a819f8
- 修改物联报表bug · b8e2127b
  lisong authored Jan 12, 2023
  
  b8e2127b
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · aaaaca51
  KeYong authored Jan 12, 2023
  
  aaaaca51
- 修改bug · 91b2314c
  KeYong authored Jan 12, 2023
  
  91b2314c
- item：修改设备类型取值 · e820f05b
  高建强 authored Jan 12, 2023
  
  e820f05b
11 Jan, 2023 1 commit
- item：消防系统接口通用化，新增通用消防系统设备分类设备状态接口 · 240c99e5
  高建强 authored Jan 11, 2023
  
  240c99e5
10 Jan, 2023 2 commits
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 6a502766
  KeYong authored Jan 10, 2023
```
# Conflicts:
#	amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml
```
  6a502766
- 修改bug · 37268f8b
  KeYong authored Jan 10, 2023
  
  37268f8b