Commits · c4c86a295b6eeaacfa6cd2e4a992860898366f6b · Administrator / browser-backend

13 May, 2020 26 commits
- Merge branch 'staging' into 'master' · c4c86a29
  Administrator authored May 13, 2020
```
Staging

See merge request !101
```
  c4c86a29
- Merge branch 'dev-zrj' into 'staging' · 30e069cb
  renjie authored May 13, 2020
```
取消检查非专线本地Ip，自有Ip

See merge request !100
```
  30e069cb
- 取消检查非专线本地Ip，自有Ip · 7e0fa987
  renjie authored May 13, 2020
  
  7e0fa987
- Merge branch 'staging' into 'master' · d96c62ab
  Administrator authored May 13, 2020
```
Staging

See merge request !99
```
  d96c62ab
- Merge branch 'dev-zrj' into 'staging' · d1b5c1cc
  renjie authored May 13, 2020
```
Dev zrj

See merge request !98
```
  d1b5c1cc
- 取消部分通知 · d47e7551
  renjie authored May 13, 2020
  
  d47e7551
- 取消部分通知 · 62585ed6
  renjie authored May 13, 2020
  
  62585ed6
- 健康检查bug · 1ec5c678
  renjie authored May 13, 2020
  
  1ec5c678
- Merge branch 'staging' into 'master' · 22bbad9e
  Administrator authored May 13, 2020
```
Staging

See merge request !96
```
  22bbad9e
- Merge branch 'dev-zrj' into 'staging' · 84604b29
  renjie authored May 13, 2020
```
Dev zrj

See merge request !97
```
  84604b29
- 健康检查bug · ba4fc3bc
  renjie authored May 13, 2020
  
  ba4fc3bc
- Merge branch 'master' of http://120.77.149.83/root/browser-backend into dev-zrj · 907b7257
  renjie authored May 13, 2020
```
 Conflicts:
	src/main/java/com/edgec/browserbackend/common/utils/Trans.java
```
  907b7257
- Merge branch 'dev-zrj' into 'staging' · 5089b823
  renjie authored May 13, 2020
```
健康检查bug

See merge request !95
```
  5089b823
- 健康检查bug · c31c9bd7
  renjie authored May 13, 2020
  
  c31c9bd7
- Merge branch 'dev-zrj' into 'staging' · 76f6b119
  renjie authored May 13, 2020
```
健康检查bug

See merge request !94
```
  76f6b119
- 健康检查bug · 29b5f6f0
  renjie authored May 13, 2020
  
  29b5f6f0
- Merge branch 'dev-zrj' into 'staging' · 21b9c145
  renjie authored May 13, 2020
```
Dev zrj

See merge request !93
```
  21b9c145
- 健康检查bug · d4bdb93b
  renjie authored May 13, 2020
  
  d4bdb93b
- 健康检查bug · 49c60c29
  renjie authored May 13, 2020
  
  49c60c29
- 健康检查bug · 8d9e4aae
  renjie authored May 13, 2020
  
  8d9e4aae
- release · 6ed3ae61
  jim authored May 13, 2020
  
  6ed3ae61
- Merge branch 'staging' into 'master' · 17eb5a06
  Administrator authored May 13, 2020
```
Staging

See merge request !92
```
  17eb5a06
- Merge branch 'dev-zrj' into 'staging' · 21eadd88
  renjie authored May 13, 2020
```
子用户购买ip权限修改

See merge request !91
```
  21eadd88
- 子用户购买ip权限修改 · ee6d20fa
  renjie authored May 13, 2020
  
  ee6d20fa
- Merge branch 'dev-zrj' into 'staging' · 7180b8d6
  renjie authored May 13, 2020
```
健康检查修改

See merge request !90
```
  7180b8d6
- 健康检查修改 · 25071643
  renjie authored May 13, 2020
  
  25071643
12 May, 2020 14 commits
- Merge branch 'dev-zrj' into 'staging' · 1d6fcca6
  renjie authored May 12, 2020
```
健康检查修改

See merge request !89
```
  1d6fcca6
- 健康检查修改 · 8b075ab8
  renjie authored May 12, 2020
  
  8b075ab8
- Merge branch 'dev-zrj' into 'staging' · 32f5c91d
  renjie authored May 12, 2020
```
健康检查

See merge request !88
```
  32f5c91d
- 健康检查 · f261ccb3
  renjie authored May 12, 2020
  
  f261ccb3
- Merge branch 'dev-zrj' into 'staging' · eb4a32a4
  renjie authored May 12, 2020
```
Dev zrj

See merge request !87
```
  eb4a32a4
- 健康检查 · 6f0c2c4e
  renjie authored May 12, 2020
  
  6f0c2c4e
- Merge branch 'dev-zrj' into 'staging' · c7d11c87
  renjie authored May 12, 2020
```
健康检查

See merge request !86
```
  c7d11c87
- 健康检查 · e9a05d94
  renjie authored May 12, 2020
  
  e9a05d94
- 健康检查 · 61eecd0b
  renjie authored May 12, 2020
  
  61eecd0b
- Merge branch 'dev-zrj' into 'staging' · 3a482587
  renjie authored May 12, 2020
```
健康检查

See merge request !85
```
  3a482587
- 健康检查 · 20bf17a6
  renjie authored May 12, 2020
  
  20bf17a6
- Merge branch 'dev-zrj' into 'staging' · e6fb4db1
  renjie authored May 12, 2020
```
健康检查

See merge request !84
```
  e6fb4db1
- 健康检查 · b66ed401
  renjie authored May 12, 2020
  
  b66ed401
- Merge branch 'staging' into 'master' · b287570b
  Administrator authored May 12, 2020
```
Staging

See merge request !82
```
  b287570b