Commits · ab9131bb2bbcf49c0feb7884c90968b51d72014b · station / YeeAmosFireAutoSysRoot

25 Nov, 2020 8 commits
- Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into upgrade · ab9131bb
  maoying authored Nov 25, 2020
  
  ab9131bb
- 修改消息地址配置 · 7e56a7ab
  maoying authored Nov 25, 2020
  
  7e56a7ab
- 更新 · 403cf6dd
  KeYong authored Nov 25, 2020
  
  403cf6dd
- Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into upgrade · 23b48e7f
  maoying authored Nov 25, 2020
  
  23b48e7f
- 添加默认用户存储 · ad2e1979
  maoying authored Nov 25, 2020
  
  ad2e1979
- 修改风险区域同步机制，不同步风险点位 · b4d317d2
  高建强 authored Nov 25, 2020
  
  b4d317d2
- item：修改将本地风险模型推送到远程同步机制 · c11bb108
  高建强 authored Nov 25, 2020
  
  c11bb108
- 合并eqintegration代码 · 6e51dfdc
  KeYong authored Nov 25, 2020
  
  6e51dfdc
24 Nov, 2020 3 commits
- mqtt · 9825e3d4
  zhengjiawei authored Nov 24, 2020
  
  9825e3d4
- 添加装备 · 770ee2b4
  zhengjiawei authored Nov 24, 2020
  
  770ee2b4
- 添加风险二级区域值 · 15a096e9
  maoying authored Nov 24, 2020
  
  15a096e9
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 1 commit

Merge branches 'CSFAS_V2.1.0.0' and 'dev_upgrade' of… · 5dd83d20

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