Commits · 70d247e173717d0b6e64251116b7ce2a3a037816 · 冯超鹏 / laravelzh

17 Dec, 2020 1 commit
- 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 19 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
- 更新tcp模块 · 6c421d6a
  冯超鹏 authored Dec 16, 2020
  
  6c421d6a
- 更新.gitignore · 05525a85
  Administrator authored Dec 16, 2020
  
  05525a85
- 更新swoole · ed885a79
  Administrator authored Dec 16, 2020
  
  ed885a79
- 更新swooleMeTcp · afd4ade7
  Administrator authored Dec 16, 2020
  
  afd4ade7
- 更新组件 · d9b43cdc
  1431670879@qq.com authored Dec 16, 2020
  
  d9b43cdc
- 更新首页统计 · 48b7d374
  Administrator authored Dec 16, 2020
  
  48b7d374
- 回滚 · df50fcd7
  Administrator authored Dec 16, 2020
  
  df50fcd7
- Merge branch 'master' of ssh://111.61.77.35:15/fengchaopeng/laravelzh into develop · 6bfae684
  冯超鹏 authored Dec 16, 2020
  
  6bfae684
15 Dec, 2020 18 commits
- no message · b054bd4b
  冯超鹏 authored Dec 15, 2020
  
  b054bd4b
- 处理bug · ac49bb84
  Administrator authored Dec 15, 2020
  
  ac49bb84
- Merge branch 'release/101' · 56331e95
  冯超鹏 authored Dec 15, 2020
```
# Conflicts:
#	app/Console/Commands/alarm.php
#	app/Console/Commands/chemicalswb.php
#	app/Console/Commands/firewb.php
#	app/Console/Commands/swoole.php
#	app/Console/Commands/swooleMeTcp.php
#	app/Http/Controllers/HomepageController.php
#	resources/js/views/dashboard/index.vue
#	resources/js/views/user/index.vue
```
  56331e95
- Merge tag 'alarm_order_store' into develop · 9d295b8e
  Administrator authored Dec 15, 2020
```
no message
```
  9d295b8e
- Merge branch 'hotfix/alarm_order_store' · b3f364f2
  Administrator authored Dec 15, 2020
  
  b3f364f2
- 更新工单列表 · 5747a2d5
  Administrator authored Dec 15, 2020
  
  5747a2d5
- no message · 29e35bf0
  冯超鹏 authored Dec 15, 2020
  
  29e35bf0
- Merge tag 'alarm_order_1.1' into develop · 8c1fa94a
  Administrator authored Dec 15, 2020
```
no message
```
  8c1fa94a
- Merge branch 'release/alarm_order_1.1' · ecc7108c
  Administrator authored Dec 15, 2020
  
  ecc7108c
- tcp协议模块 · 2025f431
  冯超鹏 authored Dec 15, 2020
  
  2025f431
- Merge branch 'feature/alarm_order' into develop · 03a2622b
  Administrator authored Dec 15, 2020
  
  03a2622b
- 工单接口 · 3b92c396
  Administrator authored Dec 15, 2020
  
  3b92c396
- 应用 · 50361874
  冯超鹏 authored Dec 15, 2020
  
  50361874
- no message · 68275847
  冯超鹏 authored Dec 15, 2020
  
  68275847
- Merge tag 'swoole' into develop · 9bb3b5fb
  Administrator authored Dec 15, 2020
```
no message
```
  9bb3b5fb
- Merge branch 'hotfix/swoole' · c6d65033
  Administrator authored Dec 15, 2020
  
  c6d65033
- swooleMeTcp 更新 · 6b452fc7
  Administrator authored Dec 15, 2020
  
  6b452fc7
- 工单模块 · b8bbed4a
  Administrator authored Dec 15, 2020
  
  b8bbed4a
12 Dec, 2020 2 commits
- Merge tag 'remote_shutoff' into develop · 44f4648b
  Administrator authored Dec 12, 2020
```
no message
```
  44f4648b
- Merge branch 'release/remote_shutoff' · f89d385c
  Administrator authored Dec 12, 2020
  
  f89d385c