Commits · dabef0131177619b56166659b60af995059587a5 · station / YeeAmosFireAutoSysRoot

07 Dec, 2020 1 commit
- bug · dabef013
  zhengjiawei authored Dec 07, 2020
  
  dabef013
02 Dec, 2020 2 commits
- Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into eqintegration · 0465b044
  KeYong authored Dec 02, 2020
```
# Conflicts:
#	YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/StationInfo.java
```
  0465b044
- 改bug · 00f018b8
  KeYong authored Dec 02, 2020
  
  00f018b8
01 Dec, 2020 1 commit
- 修改fireEquipmentId long 为Long · fcd48005
  吴俊凯 authored Dec 01, 2020
  
  fcd48005
30 Nov, 2020 3 commits
- marger修复 · da97a385
  zhengjiawei authored Nov 30, 2020
  
  da97a385
- name · 0adcd6e7
  zhengjiawei authored Nov 30, 2020
  
  0adcd6e7
- Merge branch 'dev_upgrade' of G:\AAA-mypro\java\YeeAmosFireAutoSysRoot with conflicts. · 44c58f79
  zhengjiawei authored Nov 30, 2020
  
  44c58f79
27 Nov, 2020 1 commit
- 风险rpnr值修改 · e3cf5c9a
  吴俊凯 authored Nov 27, 2020
  
  e3cf5c9a
26 Nov, 2020 1 commit
- 去除报错，以及修改查询数据sql · c46de4ff
  lizehua authored Nov 26, 2020
  
  c46de4ff
25 Nov, 2020 12 commits
- 电力设备后台SQL修改 · f01a5c93
  吴俊凯 authored Nov 25, 2020
  
  f01a5c93
- Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into eqintegration · b9cd3627
  KeYong authored Nov 25, 2020
  
  b9cd3627
- 更新首页展示内容字段 · 34164ec6
  KeYong authored Nov 25, 2020
  
  34164ec6
- 修改风险排序 · 6bf518c1
  maoying authored Nov 25, 2020
  
  6bf518c1
- 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 4 commits
- mqtt · 9825e3d4
  zhengjiawei authored Nov 24, 2020
  
  9825e3d4
- 添加装备 · 770ee2b4
  zhengjiawei authored Nov 24, 2020
  
  770ee2b4
- 添加风险二级区域值 · 15a096e9
  maoying authored Nov 24, 2020
  
  15a096e9
- 更新代码 · 90f99f3f
  KeYong authored Nov 24, 2020
  
  90f99f3f
23 Nov, 2020 2 commits
- 修改脚本文件 · 1846daa5
  maoying authored Nov 23, 2020
  
  1846daa5
- 修改设备点位，设备表相关sql · a89e1576
  maoying authored Nov 23, 2020
  
  a89e1576
21 Nov, 2020 1 commit
- 修改换流站首页信息展示 · 15ded32b
  KeYong authored Nov 21, 2020
  
  15ded32b
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