Commits · 92c88642e09bd290e814d95f0b21af8af7033ea6 · station / YeeAmosFireAutoSysRoot

05 Jan, 2021 1 commit
- 1、预案代码修改 · 92c88642
  suhuiguang authored Jan 05, 2021
  
  92c88642
30 Dec, 2020 6 commits
- Merge branch 'upgrade' into dev_upgrade-1225 · 76fc69a6
  maoying authored Dec 30, 2020
  
  76fc69a6
- 修复风险管控预案规则命名 · db8f5ae2
  maoying authored Dec 30, 2020
  
  db8f5ae2
- 1.修改建筑模块替换后，原有数据调整 · 7d988369
  suhuiguang authored Dec 30, 2020
```
2.风险与建筑同步关系查询
```
  7d988369
- Merge branch 'dev_upgrade' into dev_upgrade-1225 · 1e6ac5f6
  suhuiguang authored Dec 30, 2020
```
# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
#	YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml
```
  1e6ac5f6
- 1.同步 · 8d48f7ae
  suhuiguang authored Dec 30, 2020
  
  8d48f7ae
- 1，代码调整 · 8570ff18
  suhuiguang authored Dec 30, 2020
  
  8570ff18
29 Dec, 2020 4 commits
- sql · 67d69f24
  zhengjiawei authored Dec 29, 2020
  
  67d69f24
- sql · ce6ca1a7
  zhengjiawei authored Dec 29, 2020
  
  ce6ca1a7
- 1.区域建筑关系建立 · 95526117
  suhuiguang authored Dec 29, 2020
  
  95526117
- id -》source_id · 52af9353
  zhengjiawei authored Dec 29, 2020
  
  52af9353
27 Dec, 2020 1 commit
- 修改三维接口返回 · e179b4bd
  maoying authored Dec 27, 2020
  
  e179b4bd
23 Dec, 2020 1 commit
- Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into upgrade · f29517b0
  maoying authored Dec 23, 2020
  
  f29517b0
22 Dec, 2020 1 commit
- 更新 · 90acbef7
  KeYong authored Dec 22, 2020
  
  90acbef7
21 Dec, 2020 1 commit
- 注掉原仓库同步 · 71eb17f7
  zhengjiawei authored Dec 21, 2020
  
  71eb17f7
19 Dec, 2020 1 commit
- Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into upgrade · 8425b7c9
  maoying authored Dec 19, 2020
  
  8425b7c9
18 Dec, 2020 10 commits
- Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into eqintegration · c5fb067f
  KeYong authored Dec 18, 2020
  
  c5fb067f
- 拆分错误脚本 · cb670134
  KeYong authored Dec 18, 2020
  
  cb670134
- 修改消防水池 · 342440f5
  吴俊凯 authored Dec 18, 2020
  
  342440f5
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · 3d75e7c6
  吴俊凯 authored Dec 18, 2020
  
  3d75e7c6
- 去掉多余代码 · 0fa7894d
  KeYong authored Dec 18, 2020
  
  0fa7894d
- 更新分页数 · 85e56aee
  KeYong authored Dec 18, 2020
  
  85e56aee
- 修改预案查询 · bc36d2dd
  maoying authored Dec 18, 2020
  
  bc36d2dd
- Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into upgrade · b8b7a750
  maoying authored Dec 18, 2020
  
  b8b7a750
- 更新代码 · f2c24806
  KeYong authored Dec 18, 2020
  
  f2c24806
- 更改应急处置返回数据 · 1cfc435d
  KeYong authored Dec 18, 2020
  
  1cfc435d
17 Dec, 2020 1 commit
- 修改三维屏接口 · 9248e0f9
  maoying authored Dec 18, 2020
  
  9248e0f9
16 Dec, 2020 2 commits
- Merge remote-tracking branch 'origin/dev_upgrade' into dev_upgrade · 49e6c31a
  lizehua authored Dec 16, 2020
  
  49e6c31a
- 增加货架位置 · 486ad5ec
  lizehua authored Dec 16, 2020
  
  486ad5ec
15 Dec, 2020 8 commits
- 风险图装备code修改 · 8ca9ac67
  吴俊凯 authored Dec 15, 2020
  
  8ca9ac67
- bug · c396881e
  zhengjiawei authored Dec 15, 2020
  
  c396881e
- 规整配置文件 · b2e1de00
  maoying authored Dec 15, 2020
  
  b2e1de00
- Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into upgrade · bdd8f348
  maoying authored Dec 15, 2020
  
  bdd8f348
- 删除mongo相关代码及配置文件 · fac36522
  maoying authored Dec 15, 2020
  
  fac36522
- 表结构 · 960683e4
  zhengjiawei authored Dec 15, 2020
  
  960683e4
- bug · 28e4f699
  zhengjiawei authored Dec 15, 2020
  
  28e4f699
- 修改f_equipment_manage to f_fire_fighting_system · 9525c2f4
  zhengjiawei authored Dec 15, 2020
  
  9525c2f4
14 Dec, 2020 3 commits
- 实时监测 · 288b2038
  zhengjiawei authored Dec 14, 2020
  
  288b2038
- 站端维护添加消防队长 · 7c2db75f
  zhengjiawei authored Dec 14, 2020
  
  7c2db75f
- sql修改 · c2f5e02f
  zhengjiawei authored Dec 14, 2020
  
  c2f5e02f