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

11 Oct, 2022 2 commits
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 3b65365d
  litengwei authored Oct 11, 2022
```
# Conflicts:
#	amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
```
  3b65365d
- 任务 9899 · 361da354
  litengwei authored Oct 11, 2022
  
  361da354
10 Oct, 2022 8 commits
- 消防水池逻辑修改 · f23b3684
  zhangsen authored Oct 10, 2022
  
  f23b3684
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 8a73eb42
  litengwei authored Oct 10, 2022
```
# Conflicts:
#	amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
```
  8a73eb42
- 近七日启停 · 764ef792
  litengwei authored Oct 10, 2022
  
  764ef792
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 09b26ec2
  高建强 authored Oct 10, 2022
  
  09b26ec2
- item：装备属性扩展 · 6b883ebe
  高建强 authored Oct 10, 2022
  
  6b883ebe
- 监盘概览部分API bug修改 · ffb6040c
  zhangsen authored Oct 10, 2022
  
  ffb6040c
- 9885 监盘概览/接口开发2 · b81b8506
  tianyiming authored Oct 10, 2022
  
  b81b8506
- 监盘概览部分API提交 · 9996b380
  zhangsen authored Oct 10, 2022
  
  9996b380
09 Oct, 2022 10 commits
- 监盘概览部分API提交 · 0d0084d9
  zhangsen authored Oct 09, 2022
  
  0d0084d9
- 修改bug · c864026b
  lisong authored Oct 09, 2022
  
  c864026b
- item：扩展消防水箱 · 1ae85dd0
  高建强 authored Oct 09, 2022
  
  1ae85dd0
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 455f89e5
  高建强 authored Oct 09, 2022
  
  455f89e5
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 6ea71ccf
  litengwei authored Oct 09, 2022
  
  6ea71ccf
- 机场单位详情根据单位code查询 · ff9bba2a
  litengwei authored Oct 09, 2022
  
  ff9bba2a
- controller提交 · 53032f16
  zhangsen authored Oct 09, 2022
  
  53032f16
- controller提交 · 838ce9fc
  zhangsen authored Oct 09, 2022
  
  838ce9fc
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 33767a51
  高建强 authored Oct 09, 2022
  
  33767a51
- bug修改 · f8deb7f6
  tianyiming authored Oct 09, 2022
  
  f8deb7f6
08 Oct, 2022 6 commits
- Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6 · 9f73622c
  高建强 authored Oct 08, 2022
  
  9f73622c
- 任务 9809 · a063bdb4
  litengwei authored Oct 08, 2022
  
  a063bdb4
- item：扩展消防水箱 · 28317138
  高建强 authored Oct 08, 2022
  
  28317138
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · de7f2820
  KeYong authored Oct 08, 2022
  
  de7f2820
- 修改设备名称不显示code · dd1652ab
  KeYong authored Oct 08, 2022
  
  dd1652ab
- 修改不合格项和统计接口为根据批次号查询 · 5fde2a4a
  limei authored Oct 08, 2022
  
  5fde2a4a
30 Sep, 2022 10 commits
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · 486b0530
  limei authored Sep 30, 2022
  
  486b0530
- 新增模拟校验当前厂站接口 · a0d5ce65
  limei authored Sep 30, 2022
  
  a0d5ce65
- bug修改 · 4e35d715
  zhangsen authored Sep 30, 2022
  
  4e35d715
- 修改bug · 44ac8423
  lisong authored Sep 30, 2022
  
  44ac8423
- 修改bug · 1acf518f
  lisong authored Sep 30, 2022
  
  1acf518f
- bug修改 · 9c0cf7b6
  zhangsen authored Sep 30, 2022
  
  9c0cf7b6
- item：值班新增详情分页接口 · 5f365af6
  高建强 authored Sep 30, 2022
  
  5f365af6
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · 1fdc9dfd
  limei authored Sep 30, 2022
  
  1fdc9dfd
- 优化厂站消防数据更新接口，修改综合报告查看接口 · a869d0ea
  limei authored Sep 30, 2022
  
  a869d0ea
- 校验提交 · ee1f5e2d
  xixinzhao authored Sep 30, 2022
  
  ee1f5e2d
29 Sep, 2022 4 commits
- 三维校验 · 4113508b
  xixinzhao authored Sep 29, 2022
  
  4113508b
- 修改接口 · dd057638
  limei authored Sep 29, 2022
  
  dd057638
- 修改厂站消防数据更新接口 · 53c2f88f
  limei authored Sep 29, 2022
  
  53c2f88f
- Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · 009b72d8
  limei authored Sep 29, 2022
  
  009b72d8