Commits · cff41a3c07f7bfd7eb9987d7cbe63ed727fcd59b · Administrator / browser-backend

28 May, 2020 1 commit
- Update Set3proxyTask.java · cff41a3c
  renjie authored May 28, 2020
  
  cff41a3c
22 May, 2020 5 commits
- Merge branch 'staging' into 'master' · 05e808d7
  Administrator authored May 22, 2020
```
Staging

See merge request !138
```
  05e808d7
- Merge branch 'dev-zrj' into 'staging' · ea679c63
  renjie authored May 22, 2020
```
Dev zrj

See merge request !137
```
  ea679c63
- admin接口修改 · 12072ebb
  renjie authored May 22, 2020
  
  12072ebb
- admin接口修改 · 3ccbca33
  renjie authored May 22, 2020
  
  3ccbca33
- Merge branch 'dev-zrj' into 'master' · ca71bf75
  Administrator authored May 22, 2020
```
ipcount bug

See merge request !135
```
  ca71bf75
21 May, 2020 5 commits
- Merge branch 'dev-zrj' into 'staging' · 3d2c9233
  renjie authored May 21, 2020
```
ipcount bug

See merge request !136
```
  3d2c9233
- ipcount bug · 2c26a3a6
  renjie authored May 21, 2020
  
  2c26a3a6
- Merge branch 'staging' into 'master' · ba06d3d6
  Administrator authored May 21, 2020
```
Staging

See merge request !134
```
  ba06d3d6
- Merge branch 'dev-zrj' into 'staging' · 548c371b
  renjie authored May 21, 2020
```
删除ip错误增加返回log

See merge request !133
```
  548c371b
- 删除ip错误增加返回log · 6084f5b9
  renjie authored May 21, 2020
  
  6084f5b9
20 May, 2020 5 commits
- Merge branch 'staging' into 'master' · bf327467
  Administrator authored May 20, 2020
```
Staging

See merge request !123
```
  bf327467
- Merge branch 'dev-zrj' into 'staging' · e4de15af
  renjie authored May 20, 2020
```
子用户ip主账户显示

See merge request !132
```
  e4de15af
- 子用户ip主账户显示 · 5ad502f6
  renjie authored May 20, 2020
  
  5ad502f6
- Merge branch 'dev-zrj' into 'staging' · a1c6aa91
  renjie authored May 20, 2020
```
子用户ip主账户显示

See merge request !131
```
  a1c6aa91
- 子用户ip主账户显示 · 27331c72
  renjie authored May 20, 2020
  
  27331c72
19 May, 2020 7 commits
- Merge branch 'dev-zrj' into 'staging' · 32a3beb4
  renjie authored May 19, 2020
```
所有新用户送12

See merge request !130
```
  32a3beb4
- 所有新用户送12 · 358c8f65
  renjie authored May 19, 2020
  
  358c8f65
- Merge branch 'dev-zrj' into 'staging' · 385031e7
  renjie authored May 19, 2020
```
ip健康检查增加超时时间

See merge request !129
```
  385031e7
- ip健康检查增加超时时间 · 2a2eb699
  renjie authored May 19, 2020
  
  2a2eb699
- Merge branch 'dev-zrj' into 'staging' · 873f0c8d
  renjie authored May 19, 2020
```
Dev zrj

See merge request !128
```
  873f0c8d
- ip健康检查过滤已过期ip · 3d35f69e
  renjie authored May 19, 2020
  
  3d35f69e
- admin接口bug · f423ad8b
  renjie authored May 19, 2020
  
  f423ad8b
18 May, 2020 8 commits
- Merge branch 'dev-zrj' into 'staging' · b365f7b6
  renjie authored May 18, 2020
```
admin接口bug

See merge request !127
```
  b365f7b6
- admin接口bug · 63d370b3
  renjie authored May 18, 2020
  
  63d370b3
- Merge branch 'dev-zrj' into 'staging' · 8a2dd0d3
  renjie authored May 18, 2020
```
admin接口bug

See merge request !126
```
  8a2dd0d3
- admin接口bug · 358d53dd
  renjie authored May 18, 2020
  
  358d53dd
- Merge branch 'dev-zrj' into 'staging' · 67c25d42
  renjie authored May 18, 2020
```
admin增加花费统计

See merge request !125
```
  67c25d42
- admin增加花费统计 · 42ea0c75
  renjie authored May 18, 2020
  
  42ea0c75
- Merge branch 'dev-zrj' into 'staging' · 714d59a2
  renjie authored May 18, 2020
```
admin增加花费统计

See merge request !124
```
  714d59a2
- admin增加花费统计 · db2924cc
  renjie authored May 18, 2020
  
  db2924cc
15 May, 2020 9 commits
- Merge branch 'dev-zrj' into 'staging' · f8c68a35
  renjie authored May 15, 2020
```
admin统计ip

See merge request !122
```
  f8c68a35
- admin统计ip · aecbafb3
  renjie authored May 15, 2020
  
  aecbafb3
- Merge branch 'staging' into 'master' · 94942a23
  Administrator authored May 15, 2020
```
Staging

See merge request !121
```
  94942a23
- Merge branch 'dev-zrj' into 'staging' · 73a23124
  renjie authored May 15, 2020
```
店铺ip续费不更新bug

See merge request !120
```
  73a23124
- 店铺ip续费不更新bug · 2436758d
  renjie authored May 15, 2020
  
  2436758d
- Merge branch 'dev-zrj' into 'staging' · 95a44b42
  renjie authored May 15, 2020
```
店铺ip续费不更新bug

See merge request !119
```
  95a44b42
- 店铺ip续费不更新bug · 7ff109d0
  renjie authored May 15, 2020
  
  7ff109d0
- Merge branch 'dev-zrj' into 'staging' · 245f2a38
  renjie authored May 15, 2020
```
店铺ip续费不更新bug

See merge request !118
```
  245f2a38
- 店铺ip续费不更新bug · daa43adc
  renjie authored May 15, 2020
  
  daa43adc