Commits · aad8d98c96f88338823a11c43da965ab47d48c6c · station / YeeAmosFireAutoSysRoot

20 Jan, 2021 9 commits
- 执行记录分页列表 · aad8d98c
  田涛 authored Jan 20, 2021
  
  aad8d98c
- Merge remote-tracking branch 'origin/dev_upgrade-1225' into dev_upgrade-1225 · f0953cd0
  田涛 authored Jan 20, 2021
  
  f0953cd0
- 配置文件修改 · ba097018
  吴俊凯 authored Jan 20, 2021
  
  ba097018
- 代码合并 · 07d376a0
  田涛 authored Jan 20, 2021
  
  07d376a0
- Merge branch 'dev_upgrade-1225' into dev_upgrade-1225-wjk · 897b8d6d
  吴俊凯 authored Jan 20, 2021
```
# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanOperationRecordDao.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java
冲突解决
```
  897b8d6d
- 预案启动暂时提交 · 42f8ab70
  吴俊凯 authored Jan 20, 2021
  
  42f8ab70
- bug修复 · 8ad9e5cd
  田涛 authored Jan 20, 2021
  
  8ad9e5cd
- 数字预案分页查询接口返回绑定对象信息 · 98b0b20c
  田涛 authored Jan 20, 2021
  
  98b0b20c
- 数字预案分页查询接口参数修改 · 80c254e6
  田涛 authored Jan 20, 2021
  
  80c254e6
19 Jan, 2021 12 commits
- 代码冲突提交 · e914a731
  吴俊凯 authored Jan 19, 2021
  
  e914a731
- Merge branch 'dev_upgrade-1225' into dev_upgrede-1225-wjk · efbfde61
  吴俊凯 authored Jan 19, 2021
```
# Conflicts:
#	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
代码冲突合并
```
  efbfde61
- 预案执行记录分页查询 · 76ac4874
  吴俊凯 authored Jan 19, 2021
  
  76ac4874
- 数字预案绑定资源删除信息同步 · 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