Commits · f95ec0533703fdeafba313c2e5208f844fe5bf10 · Administrator / browser-backend

14 May, 2020 15 commits
- Merge branch 'staging' into 'master' · f95ec053
  Administrator authored May 14, 2020
```
Staging

See merge request !111
```
  f95ec053
- Merge branch 'dev-zrj' into 'staging' · 61371356
  renjie authored May 14, 2020
```
删除ip bug

See merge request !112
```
  61371356
- 删除ip bug · faf22d75
  renjie authored May 14, 2020
  
  faf22d75
- Merge branch 'dev-zrj' into 'staging' · 47e267f6
  renjie authored May 14, 2020
```
删除ip bug

See merge request !110
```
  47e267f6
- 删除ip bug · 8b12e0e8
  renjie authored May 14, 2020
  
  8b12e0e8
- Merge branch 'staging' into 'master' · 240a27eb
  Administrator authored May 14, 2020
```
Staging

See merge request !109
```
  240a27eb
- Merge branch 'dev-zrj' into 'staging' · 9b887754
  renjie authored May 14, 2020
```
删除ip失败通知

See merge request !108
```
  9b887754
- 删除ip失败通知 · 4380c5e4
  renjie authored May 14, 2020
  
  4380c5e4
- Merge branch 'dev-zrj' into 'staging' · 349bd8c8
  renjie authored May 14, 2020
```
购买ip显示时间bug

See merge request !107
```
  349bd8c8
- 购买ip显示时间bug · 61e6897e
  renjie authored May 14, 2020
  
  61e6897e
- Merge branch 'dev-zrj' into 'staging' · 8d9c5e15
  renjie authored May 14, 2020
```
删除ip失败增加通知

See merge request !106
```
  8d9c5e15
- 删除ip失败增加通知 · dc4bb8ad
  renjie authored May 14, 2020
  
  dc4bb8ad
- Merge branch 'dev-zrj' into 'staging' · f32a170a
  renjie authored May 14, 2020
```
Dev zrj

See merge request !105
```
  f32a170a
- Merge branch 'dev-zrj' of http://120.77.149.83/root/browser-backend into dev-zrj · 1aec71a1
  renjie authored May 14, 2020
  
  1aec71a1
- 删除ip失败增加通知 · f8933bac
  renjie authored May 14, 2020
  
  f8933bac
13 May, 2020 25 commits
- Merge branch 'staging' into 'master' · 4c380564
  Administrator authored May 13, 2020
```
Staging

See merge request !104
```
  4c380564
- Merge branch 'dev-zrj' into 'staging' · 0b52636b
  renjie authored May 13, 2020
```
ip购买时间bug

See merge request !103
```
  0b52636b
- ip购买时间bug · d5e1f031
  renjie authored May 13, 2020
  
  d5e1f031
- Merge branch 'dev-zrj' into 'staging' · 1a17fbec
  renjie authored May 13, 2020
```
ip购买时间bug

See merge request !102
```
  1a17fbec
- ip购买时间bug · c71fe39a
  renjie authored May 13, 2020
  
  c71fe39a
- 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