Commits · fac20f45d63a5a9930ee70cf5beb544e6f521375 · Zhang Xin / max_android_panel · GitLab

13 May, 2019 2 commits
- Merge commit 'deabd777' into dev · fac20f45
```
# Conflicts:
#	client/util/logger.js
#	client/util/socket.js
```
  刘珅 committed May 13, 2019
  fac20f45 Browse Files
- 更新pad连接 · aef9c86c
  刘珅 committed May 13, 2019
  
  aef9c86c Browse Files
08 May, 2019 15 commits
- Merge branch 'dev' of git.mjitech.com:zhangxin/max_android_panel into dev · 3003bbcc
  wujiabao committed May 08, 2019
  
  3003bbcc Browse Files
- fix 问题 · 4ac2783c
  wujiabao committed May 08, 2019
  
  4ac2783c Browse Files
- Merge commit '7b50d3c6' into dev · 46ecad88
```
# Conflicts:
#	package.json
```
  刘珅 committed May 08, 2019
  46ecad88 Browse Files
- 修改端口 · aa2a707a
  刘珅 committed May 08, 2019
  
  aa2a707a Browse Files
- Merge branch 'dev' of git.mjitech.com:zhangxin/max_android_panel into dev · 7b50d3c6
  wujiabao committed May 08, 2019
  
  7b50d3c6 Browse Files
- Merge branch 'dev' · deabd777
  Zhang Xin committed May 08, 2019
  
  deabd777 Browse Files
- change version · 7dd61382
  Zhang Xin committed May 08, 2019
  
  7dd61382 Browse Files
- fix 拉取工单接口 · 0674540e
  Zhang Xin committed May 08, 2019
  
  0674540e Browse Files
- 增加端口和版本查询 · 889dcfe7
  wujiabao committed May 08, 2019
  
  889dcfe7 Browse Files
- Merge branch 'dev' · b720104c
  Zhang Xin committed May 08, 2019
  
  b720104c Browse Files
- change socket æ½超时时间为3min · cbe02f80
  Zhang Xin committed May 08, 2019
  
  cbe02f80 Browse Files
- fix 冲突 & merge from dev for 需求195 & bug 2950 · 03f64bc2
  Zhang Xin committed May 08, 2019
  
  03f64bc2 Browse Files
- change log info · 8cf361f6
  Zhang Xin committed May 08, 2019
  
  8cf361f6 Browse Files
- 协助测试 · d6463c2d
  wujiabao committed May 08, 2019
  
  d6463c2d Browse Files
- 协助测试 · 2cf9bcbc
  wujiabao committed May 08, 2019
  
  2cf9bcbc Browse Files
07 May, 2019 5 commits
- fix bug · 2936bf90
  Zhang Xin committed May 07, 2019
  
  2936bf90 Browse Files
- add asycn & await · da424e86
  Zhang Xin committed May 07, 2019
  
  da424e86 Browse Files
- test · 186dc590
  Zhang Xin committed May 07, 2019
  
  186dc590 Browse Files
- change success_closedoor to RESPONSE_ATTACHMENT_STATUS · dfae62ea
  Zhang Xin committed May 07, 2019
  
  dfae62ea Browse Files
- 协助测试 · d5ee6a9b
  wujiabao committed May 07, 2019
  
  d5ee6a9b Browse Files
25 Apr, 2019 2 commits
- fix product domain for test · 622aa165
  Zhang Xin committed Apr 25, 2019
  
  622aa165 Browse Files
- 优化 · 75cb276f
  Zhang Xin committed Apr 25, 2019
  
  75cb276f Browse Files
24 Apr, 2019 1 commit
- fix log & finish å需求195 · 93ae126b
  Zhang Xin committed Apr 24, 2019
  
  93ae126b Browse Files
18 Apr, 2019 2 commits
- 测试 · 44641a34
  wujiabao committed Apr 18, 2019
  
  44641a34 Browse Files
- 协助测试 · 403fb21d
  wujiabao committed Apr 18, 2019
  
  403fb21d Browse Files
17 Apr, 2019 2 commits
- 需求178 · 42699ffa
  wujiabao committed Apr 17, 2019
  
  42699ffa Browse Files
- 改回测试环境 · 6786b627
  wujiabao committed Apr 17, 2019
  
  6786b627 Browse Files
16 Apr, 2019 4 commits
- 测试预发 · 3deb1652
  wujiabao committed Apr 16, 2019
  
  3deb1652 Browse Files
- 测试预发 · 323088e2
  wujiabao committed Apr 16, 2019
  
  323088e2 Browse Files
- 测试预发 · e51693ee
  wujiabao committed Apr 16, 2019
  
  e51693ee Browse Files
- 测试 · 146cc58d
  wujiabao committed Apr 16, 2019
  
  146cc58d Browse Files
15 Apr, 2019 1 commit
- 报损增加区域 · eacdee7e
  wujiabao committed Apr 15, 2019
  
  eacdee7e Browse Files
09 Apr, 2019 3 commits
- ç改成正常测试版本 · ddc1dd41
  Zhang Xin committed Apr 09, 2019
  
  ddc1dd41 Browse Files
- 完成平板需求168 & 添加log & 修改平板BUG2818 · ff098860
  Zhang Xin committed Apr 09, 2019
  
  ff098860 Browse Files
- fix domain from test to preprod · 2b057a5c
  Zhang Xin committed Apr 09, 2019
  
  2b057a5c Browse Files
08 Apr, 2019 3 commits
- fix port from 7788 to 7780 · 22765d01
  Zhang Xin committed Apr 08, 2019
  
  22765d01 Browse Files
- reback · 7a87e9b3
  Zhang Xin committed Apr 08, 2019
  
  7a87e9b3 Browse Files
- fetch catch error send again · b0391911
  Zhang Xin committed Apr 08, 2019
  
  b0391911 Browse Files