Commits · 09e4faa047f10bb29e712267be756e408eb6de7d · station / YeeAmosFireAutoSysRoot

23 Apr, 2020 9 commits
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · 09e4faa0
  shanqiyun authored Apr 23, 2020
  
  09e4faa0
- 联调接口 · a930110a
  shanqiyun authored Apr 23, 2020
  
  a930110a
- 1.删除测试数据-全景监控 · 65b1a423
  suhuiguang authored Apr 23, 2020
  
  65b1a423
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · b642bb7a
  suhuiguang authored Apr 23, 2020
  
  b642bb7a
- 1.日志实现由log4j->loggack · c2dd8870
  suhuiguang authored Apr 23, 2020
  
  c2dd8870
- 修改打jar包 · 56199aef
  吴江 authored Apr 23, 2020
  
  56199aef
- 修改配置 · e69a018a
  吴江 authored Apr 23, 2020
  
  e69a018a
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · cf91e8c6
  吴江 authored Apr 23, 2020
  
  cf91e8c6
- 修改配置 · 66c1b345
  吴江 authored Apr 23, 2020
  
  66c1b345
22 Apr, 2020 17 commits
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · e0239459
  suhuiguang authored Apr 22, 2020
  
  e0239459
- 1.删除测试代码-全景监控 · 9fafc32f
  suhuiguang authored Apr 22, 2020
  
  9fafc32f
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · 99f02e2c
  suhuiguang authored Apr 22, 2020
```
# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/View3dMapper.java
```
  99f02e2c
- 1.提交-全景监控 · cf7c11d7
  suhuiguang authored Apr 22, 2020
  
  cf7c11d7
- 冲突 · f72c369e
  shanqiyun authored Apr 22, 2020
  
  f72c369e
- 新增接口 · 003010c6
  shanqiyun authored Apr 22, 2020
  
  003010c6
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · 87a2f8e3
  suhuiguang authored Apr 22, 2020
  
  87a2f8e3
- 1.修改报错 · 647a3d5f
  suhuiguang authored Apr 22, 2020
  
  647a3d5f
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · a7c8b3c2
  吴江 authored Apr 22, 2020
  
  a7c8b3c2
- 提交配置 · 23d4ceae
  吴江 authored Apr 22, 2020
  
  23d4ceae
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · 84111b74
  suhuiguang authored Apr 22, 2020
  
  84111b74
- 1.增加url-全景监控 · 3f943d65
  suhuiguang authored Apr 22, 2020
  
  3f943d65
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · 449f3d1e
  吴江 authored Apr 22, 2020
  
  449f3d1e
- 修改配置 · 66fa6731
  吴江 authored Apr 22, 2020
  
  66fa6731
- 1.删除测试代码-全景监控 · 4286255e
  suhuiguang authored Apr 22, 2020
  
  4286255e
- 1.全景监控，今日安全指数 · f3cd3e18
  suhuiguang authored Apr 22, 2020
  
  f3cd3e18
- 修改redis · 70cc550b
  吴江 authored Apr 22, 2020
  
  70cc550b
21 Apr, 2020 10 commits
- 1.代码整理 · dd7734ad
  suhuiguang authored Apr 21, 2020
  
  dd7734ad
- 1.修改getone为findone · d878bb97
  suhuiguang authored Apr 21, 2020
  
  d878bb97
- 冲突 · c8dd8bb4
  shanqiyun authored Apr 21, 2020
  
  c8dd8bb4
- 新增接口 · f98c6d80
  shanqiyun authored Apr 21, 2020
  
  f98c6d80
- common · bb374985
  shanqiyun authored Apr 21, 2020
  
  bb374985
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · 5b6b8ce6
  suhuiguang authored Apr 21, 2020
```
# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/View3dController.java
```
  5b6b8ce6
- 1.修改命名规则 · fd137860
  suhuiguang authored Apr 21, 2020
  
  fd137860
- 冲突 · fc9c31ed
  shanqiyun authored Apr 21, 2020
  
  fc9c31ed
- 新增区域树查询，区域详情查询接口 · edbc4a0e
  shanqiyun authored Apr 21, 2020
  
  edbc4a0e
- 1.公共代码部分提交-全景监控 · 3e833c1e
  suhuiguang authored Apr 21, 2020
  
  3e833c1e
20 Apr, 2020 4 commits
- 新增View3dController · 003761dd
  shanqiyun authored Apr 20, 2020
  
  003761dd
- 1.修改字段 · 60f67b73
  suhuiguang authored Apr 20, 2020
  
  60f67b73
- 1.修改pom版本升级到2.1.0 · 89b4030e
  suhuiguang authored Apr 20, 2020
```
2.修改7个表增加ue4坐标
```
  89b4030e
- 1.数据库脚本整理 · 982ff9b8
  suhuiguang authored Apr 20, 2020
  
  982ff9b8