Commits · d015e7bd7003619c426281e7573a99a33e0e76a0 · station / YeeAmosFireAutoSysRoot

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 11 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
- 删除alarm相关代码 · 6a109a14
  maoying authored Jan 11, 2021
  
  6a109a14
08 Jan, 2021 2 commits
- item：预案接口优化 · 899d71c1
  高建强 authored Jan 08, 2021
  
  899d71c1
- item：新增预案状态、时间、来源 · a9e71634
  高建强 authored Jan 08, 2021
  
  a9e71634
07 Jan, 2021 5 commits
- item：添加server.servlet.context-path=/fireAutoSys · a47db4b3
  高建强 authored Jan 07, 2021
  
  a47db4b3
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · 1089fe4b
  高建强 authored Jan 07, 2021
  
  1089fe4b
- item：重点设备分页及启动预案接口新增 · 95e19c5e
  高建强 authored Jan 07, 2021
  
  95e19c5e
- 1.bug修改 · 858dafb7
  suhuiguang authored Jan 07, 2021
  
  858dafb7
- 1.修改bug · 1f33c716
  suhuiguang authored Jan 07, 2021
  
  1f33c716
05 Jan, 2021 8 commits
- 修改运行天数算法 · 66909669
  maoying authored Jan 05, 2021
  
  66909669
- 修改为开发环境 · 8c648795
  suhuiguang authored Jan 05, 2021
  
  8c648795
- 启动报错：Loading class `com.mysql.jdbc.Driver'. This is deprecated. The new driver… · 31e0c162
  suhuiguang authored Jan 05, 2021
```
启动报错：Loading class `com.mysql.jdbc.Driver'. This is deprecated. The new driver class is com.mysql.cj.jdbc.Driver
```
  31e0c162
- Merge branch 'dev_upgrade-1225' of… · d95cbd07
  suhuiguang authored Jan 05, 2021
```
Merge branch 'dev_upgrade-1225' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade-1225
```
  d95cbd07
- 1、预案代码修改 · 92c88642
  suhuiguang authored Jan 05, 2021
  
  92c88642
- 预案启动 · 2e32c025
  zhengjiawei authored Jan 05, 2021
  
  2e32c025
- studio_normalapp_2681691 · 430bc947
  zhengjiawei authored Jan 05, 2021
  
  430bc947
- bug · 712c3a0d
  zhengjiawei authored Jan 05, 2021
  
  712c3a0d
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 2 commits
- sql · 67d69f24
  zhengjiawei authored Dec 29, 2020
  
  67d69f24
- sql · ce6ca1a7
  zhengjiawei authored Dec 29, 2020
  
  ce6ca1a7