Commits · 9e76d7d1c53da9249b1ade2ae6c1192130223556 · 冯超鹏 / laravelzh

18 Dec, 2020 16 commits
- Merge branch 'hotfix/map_list_location' · 9e76d7d1
  Administrator authored Dec 18, 2020
  
  9e76d7d1
- 调整地图 · 5a60a985
  Administrator authored Dec 18, 2020
  
  5a60a985
- 图片 · d3b75173
  冯超鹏 authored Dec 18, 2020
  
  d3b75173
- Merge branch 'release/alarm_order' · aa63ca10
  Administrator authored Dec 18, 2020
  
  aa63ca10
- Merge tag 'swoole_tcp' into develop · 3fd7c9d5
  Administrator authored Dec 18, 2020
```
no message
```
  3fd7c9d5
- Merge branch 'hotfix/swoole_tcp' · 45ed0789
  Administrator authored Dec 18, 2020
  
  45ed0789
- 更新swoole 工单列表 · 2d05d9e1
  Administrator authored Dec 18, 2020
  
  2d05d9e1
- 更新工单 · 07cc3fe7
  Administrator authored Dec 18, 2020
  
  07cc3fe7
- Merge branch 'feature/alarm_order_vue' into develop · dda57577
  Administrator authored Dec 18, 2020
  
  dda57577
- 更新工单 · 756f51d4
  Administrator authored Dec 18, 2020
  
  756f51d4
- 更新工单 · 23e72854
  Administrator authored Dec 18, 2020
  
  23e72854
- 更新工单流程 · 39b566f0
  Administrator authored Dec 18, 2020
  
  39b566f0
- 工单更新 · ed1b332b
  Administrator authored Dec 18, 2020
  
  ed1b332b
- Merge branch 'master' into feature/alarm_order_vue · ec382860
  Administrator authored Dec 18, 2020
  
  ec382860
- 更新工单流程 · 2b4865bc
  Administrator authored Dec 18, 2020
  
  2b4865bc
- user用户工单列表 · 5b2f77a5
  冯超鹏 authored Dec 18, 2020
  
  5b2f77a5
17 Dec, 2020 13 commits
- 工单详情 · 39910790
  Administrator authored Dec 17, 2020
  
  39910790
- Merge branch 'master' of ssh://111.61.77.35:15/fengchaopeng/laravelzh · 68363ce4
  冯超鹏 authored Dec 17, 2020
  
  68363ce4
- 更新数据 · 3891f442
  冯超鹏 authored Dec 17, 2020
  
  3891f442
- 工单详情 · 564f3964
  Administrator authored Dec 17, 2020
  
  564f3964
- Merge branch 'master' into feature/alarm_order_vue · b0e7cae8
  Administrator authored Dec 17, 2020
  
  b0e7cae8
- 工单详情 · 7c064b78
  Administrator authored Dec 17, 2020
  
  7c064b78
- 提交工单模块 · 89169587
  冯超鹏 authored Dec 17, 2020
  
  89169587
- Merge branch 'master' into feature/alarm_order_vue · b1aa10a2
  Administrator authored Dec 17, 2020
```
# Conflicts:
#	app/Http/Controllers/AlarmOrderController.php
#	routes/api.php
```
  b1aa10a2
- 抢险工单列表 · f72cb9ce
  Administrator authored Dec 17, 2020
  
  f72cb9ce
- tcp 返回信息模块 · 91dedef5
  冯超鹏 authored Dec 17, 2020
  
  91dedef5
- no message · 745e0445
  冯超鹏 authored Dec 17, 2020
  
  745e0445
- tcp模块协议 · 673ec07e
  冯超鹏 authored Dec 17, 2020
  
  673ec07e
- Merge branch 'master' into feature/alarm_order_vue · 70d247e1
  Administrator authored Dec 17, 2020
```
# Conflicts:
#	resources/js/views/history/alarms.vue
#	routes/api.php
```
  70d247e1
16 Dec, 2020 11 commits
- 工单列表 · 139848a8
  Administrator authored Dec 16, 2020
  
  139848a8
- 工单模块 app · 75ea2f15
  冯超鹏 authored Dec 16, 2020
  
  75ea2f15
- 生成工单 · 3d597bb2
  Administrator authored Dec 16, 2020
  
  3d597bb2
- 更新电磁阀控制 · 90f8e536
  Administrator authored Dec 16, 2020
  
  90f8e536
- 更新切断装置状态 · 47859650
  Administrator authored Dec 16, 2020
  
  47859650
- 工单后台 · ce84b176
  Administrator authored Dec 16, 2020
  
  ce84b176
- tcp 模块 · 0c6beacb
  冯超鹏 authored Dec 16, 2020
  
  0c6beacb
- tcp 协议模块 · 90d56336
  冯超鹏 authored Dec 16, 2020
  
  90d56336
- Merge branch 'develos' · 059a029c
  冯超鹏 authored Dec 16, 2020
  
  059a029c
- tcp 协议更新 · 23f5a4df
  冯超鹏 authored Dec 16, 2020
  
  23f5a4df
- Merge branch 'develos' · cbb72e97
  冯超鹏 authored Dec 16, 2020
  
  cbb72e97