Commits · 1846daa5c84fa25064baa80acf1afe97c700dfc7 · station / YeeAmosFireAutoSysRoot

23 Nov, 2020 2 commits
- 修改脚本文件 · 1846daa5
  maoying authored Nov 23, 2020
  
  1846daa5
- 修改设备点位，设备表相关sql · a89e1576
  maoying authored Nov 23, 2020
  
  a89e1576
19 Nov, 2020 2 commits
- Merge branch 'eqintegration' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into eqintegration · 49c52f4a
  KeYong authored Nov 19, 2020
```
# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/config/PermissionAspect.java
#	YeeAmosFireAutoSysStart/src/main/resources/application.properties
```
  49c52f4a
- 提交mqtt推送代码 · 79838267
  KeYong authored Nov 19, 2020
  
  79838267
13 Nov, 2020 2 commits
- Merge branch 'upgrade' into eqintegration · 206934cc
  maoying authored Nov 13, 2020
  
  206934cc
- 调预案相关代码 · 07e20761
  maoying authored Nov 13, 2020
  
  07e20761
09 Nov, 2020 2 commits
- 修改初始化用户登录信息判断 · f53f8231
  maoying authored Nov 09, 2020
  
  f53f8231
- Merge branch 'upgrade' into eqintegration · 38e19aba
  maoying authored Nov 09, 2020
  
  38e19aba
06 Nov, 2020 2 commits
- 修改查询数据sql · e529b247
  lizehua authored Nov 06, 2020
  
  e529b247
- 修改系统账号登陆信息存储 · 66bc74c0
  maoying authored Nov 06, 2020
  
  66bc74c0
05 Nov, 2020 2 commits
- 火灾告警，故障告警 · a8eb55c8
  zhengjiawei authored Nov 05, 2020
  
  a8eb55c8
- 风险模型 · 719ffc15
  zhengjiawei authored Nov 05, 2020
  
  719ffc15
04 Nov, 2020 1 commit
- 重点设备配套设施调整 · 192a86d3
  zhengjiawei authored Nov 04, 2020
  
  192a86d3
03 Nov, 2020 1 commit
- 修改脚本文件 · 028f276b
  maoying authored Nov 03, 2020
  
  028f276b
01 Nov, 2020 2 commits
- Merge branch 'upgrade' into dev_upgrade_rule · 71b791bc
  maoying authored Nov 02, 2020
  
  71b791bc
- 删除无用注释 · 59633ae7
  maoying authored Nov 02, 2020
  
  59633ae7
21 Oct, 2020 3 commits
- Merge branch 'upgrade' into dev_upgrade_rule · 83790fc0
  maoying authored Oct 21, 2020
  
  83790fc0
- Merge branch 'v2' into upgrade · a8371a04
  maoying authored Oct 21, 2020
  
  a8371a04
- 修改消防小室图片上传 · 4e6bf330
  maoying authored Oct 21, 2020
  
  4e6bf330
19 Oct, 2020 7 commits
- 合并v2.1.0.0修复的bug · a0c5e717
  maoying authored Oct 19, 2020
  
  a0c5e717
- 修改三维风险详情风险描述不显示问题 · b82e5c78
  maoying authored Oct 19, 2020
  
  b82e5c78
- 解决冲突 · 42546691
  maoying authored Oct 19, 2020
  
  42546691
- Merge branch 'dev_upgrade_rule' of 172.16.10.76:station/YeeAmosFireAutoSysRoot… · 1f4383c6
  maoying authored Oct 19, 2020
```
Merge branch 'dev_upgrade_rule' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into dev_upgrade_rule
```
  1f4383c6
- 修改风险推送bug · e6bca411
  maoying authored Oct 19, 2020
  
  e6bca411
- 1.配置文件全部调整增加规则mqtt · 9d2c3da2
  suhuiguang authored Oct 19, 2020
  
  9d2c3da2
- 1.修改不一致 · afee2bfe
  suhuiguang authored Oct 19, 2020
  
  afee2bfe
16 Oct, 2020 1 commit

Merge branch 'dev_upgrade' into dev_upgrade_rule · e4024d8f

authored Oct 16, 2020

# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IRiskSourceService.java

e4024d8f

09 Oct, 2020 1 commit
- 预案记录查询sql优化 · dcc9ce68
  zhengjiangtao authored Oct 09, 2020
  
  dcc9ce68
26 Sep, 2020 2 commits
- Merge branches 'CSFAS_V2.1.0.0' and 'dev_upgrade' of… · 5dd83d20
  zhengjiangtao authored Sep 26, 2020
```
Merge branches 'CSFAS_V2.1.0.0' and 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into CSFAS_V2.1.0.0
```
  5dd83d20
- 搜索消息优化 · c67a5154
  zhengjiangtao authored Sep 26, 2020
  
  c67a5154
22 Sep, 2020 2 commits
- CSFAS-944 【消防指挥】实景监控>沙盘模式，应不显示已删除状态的风险点（附图 · 1289e612
  zhengjiangtao authored Sep 22, 2020
  
  1289e612
- duty值班优化 · c7dbaa5c
  zhengjiangtao authored Sep 22, 2020
  
  c7dbaa5c
15 Sep, 2020 4 commits
- *）选择公司添加返回角色信息 · 56123f68
  高东东 authored Sep 15, 2020
  
  56123f68
- *）修改自动选择公司bug · 08a39097
  高东东 authored Sep 15, 2020
  
  08a39097
- *)修改规则动作bug · 623f8997
  高东东 authored Sep 15, 2020
  
  623f8997
- 优化mqtt推送及3维屏搜索添加riskSourceId参数 · 5b8f9a9f
  zhengjiangtao authored Sep 15, 2020
  
  5b8f9a9f
10 Sep, 2020 3 commits
- Merge branch 'dev_upgrade_rule' of… · 8e11b9c9
  zhengjiangtao authored Sep 10, 2020
```
Merge branch 'dev_upgrade_rule' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade_rule
```
  8e11b9c9
- *）添加预案回放退出工程 · ca37a2ae
  高东东 authored Sep 10, 2020
  
  ca37a2ae
- Merge branch 'dev_upgrade_rule' of… · 4826402d
  zhengjiangtao authored Sep 10, 2020
```
Merge branch 'dev_upgrade_rule' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade_rule
```
  4826402d
09 Sep, 2020 1 commit
- 完成“换流站系统风险区域数据同步至仓库货位”同步推送功能 · 43869524
  张展弋 authored Sep 09, 2020
  
  43869524