Commits · e255d280d15de40b67bb5b910650042c75450d3c · station / YeeAmosFireAutoSysRoot

19 Jan, 2021 9 commits
- 数字预案绑定资源删除信息同步 · e255d280
  田涛 authored Jan 19, 2021
  
  e255d280
- 数字预案绑定资源删除信息同步 · 640a10a8
  田涛 authored Jan 19, 2021
  
  640a10a8
- 预案代码合并 · e3d3fb78
  田涛 authored Jan 19, 2021
  
  e3d3fb78
- Merge branch '数字预案增删改查/启用停用' into dev_upgrade-1225 · 5022aa0f
  田涛 authored Jan 19, 2021
```
# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/ContingencyPlanController.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanDetailDao.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanEquipmentDao.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/ContingencyPlanService.java
```
  5022aa0f
- 预案启动代码提交 · 494b5d5a
  吴俊凯 authored Jan 19, 2021
  
  494b5d5a
- 预案接口优化 · d3043d3b
  田涛 authored Jan 19, 2021
  
  d3043d3b
- 预案接口优化 · 812509cc
  田涛 authored Jan 19, 2021
  
  812509cc
- 预案接口优化 · 27fb08a5
  田涛 authored Jan 19, 2021
  
  27fb08a5
- 预案接口优化 · 69e5a524
  田涛 authored Jan 19, 2021
  
  69e5a524
18 Jan, 2021 3 commits
- 数字预案查询已绑定的对象ID · c13c7a25
  田涛 authored Jan 18, 2021
  
  c13c7a25
- 数字预案分页查询接口 · 06e6034f
  田涛 authored Jan 18, 2021
  
  06e6034f
- 数字预案分页查询接口 · e01ccc1b
  田涛 authored Jan 18, 2021
  
  e01ccc1b
15 Jan, 2021 11 commits
- 数字预案增删改查/启停用接口 · b437c0ec
  田涛 authored Jan 15, 2021
  
  b437c0ec
- 数字预案增删改查/启停用接口 · 153973f9
  田涛 authored Jan 15, 2021
  
  153973f9
- Merge branch 'dev_upgrade' into dev_upgrade-1225 · 1efd642c
  吴俊凯 authored Jan 15, 2021
  
  1efd642c
- 预案启动暂时提交 · b4afff5c
  吴俊凯 authored Jan 15, 2021
  
  b4afff5c
- item：消防预案执行，新增摄像头、消防炮消息返回 · 0d5d5664
  高建强 authored Jan 15, 2021
  
  0d5d5664
- 启动报错提交 · e1d5bb1b
  吴俊凯 authored Jan 15, 2021
  
  e1d5bb1b
- 预案详情实体类修改 · b6f3aef2
  吴俊凯 authored Jan 15, 2021
  
  b6f3aef2
- Merge branch '数字预案' into dev_upgrade-1225 · 75e23f33
  田涛 authored Jan 15, 2021
  
  75e23f33
- 数字预案表实体、dao、mapper创建 · 1dddc1a1
  田涛 authored Jan 15, 2021
  
  1dddc1a1
- 预案状态枚举提交 · fe383c42
  吴俊凯 authored Jan 15, 2021
  
  fe383c42
- 预案分类树提交 · 9664a630
  吴俊凯 authored Jan 15, 2021
  
  9664a630
14 Jan, 2021 1 commit
- item：消防预案重点设备关联视频、消防炮 · fc33d787
  高建强 authored Jan 14, 2021
  
  fc33d787
13 Jan, 2021 4 commits
- 代码漏提 · d015e7bd
  吴俊凯 authored Jan 13, 2021
  
  d015e7bd
- Merge branch 'dev_upgrade' into dev_upgrade-1225 · 88a55931
  吴俊凯 authored Jan 13, 2021
```
# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentServiceImpl.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
冲突修改
```
  88a55931
- 预案执行代码合并 · 21d66369
  吴俊凯 authored Jan 13, 2021
  
  21d66369
- id修改提交 · cc30823e
  吴俊凯 authored Jan 13, 2021
  
  cc30823e
12 Jan, 2021 2 commits
- 对全局LONG 全局解析转换为String 类型，防止前台后失真 · 6ad5919a
  吴俊凯 authored Jan 12, 2021
  
  6ad5919a
- 删除f_risk_source_equipment、f_risk_source_point_inputitem表及注释相关代码 · 4b9f47b7
  taabe authored Jan 12, 2021
  
  4b9f47b7
11 Jan, 2021 10 commits
- 修改脚本函数 · cd98ca66
  maoying authored Jan 11, 2021
  
  cd98ca66
- 解决冲突 · 6cf83759
  maoying authored Jan 11, 2021
  
  6cf83759
- item：修改维护脚本 · d3067ff8
  高建强 authored Jan 11, 2021
  
  d3067ff8
- 合并upgrade分支代码 · 95e0a468
  maoying authored Jan 11, 2021
  
  95e0a468
- 解决冲突 · 61767d5d
  maoying authored Jan 11, 2021
  
  61767d5d
- 注释FireEquipment相关代码 · fe42f92b
  maoying authored Jan 11, 2021
  
  fe42f92b
- 注无用库相关代码 · aa89ba54
  zhengjiawei authored Jan 11, 2021
  
  aa89ba54
- 删除fireCar实体，注释相关代码 · 2ad73325
  maoying authored Jan 11, 2021
  
  2ad73325
- item：注入equipmentService; · d00f258a
  高建强 authored Jan 11, 2021
  
  d00f258a
- item：重点设备预案流程优化，状态修改 · 411e7519
  高建强 authored Jan 11, 2021
  
  411e7519