Commits · caca0925eacc26fdea7c341664a2b54bc99bbbae · Administrator / browser-backend

20 Apr, 2020 4 commits
- Merge branch 'dev-zrj' into 'staging' · caca0925
  renjie authored Apr 20, 2020
```
Dev zrj

See merge request !20
```
  caca0925
- Merge branch 'master' of http://120.77.149.83/root/browser-backend into dev-zrj · 8991ceda
  renjie authored Apr 20, 2020
```
 Conflicts:
	src/main/java/com/edgec/browserbackend/account/service/impl/AdministratorServiceImpl.java
```
  8991ceda
- Merge branch 'dev-zrj' into 'staging' · 469b4369
  renjie authored Apr 20, 2020
```
付费bug

See merge request !18
```
  469b4369
- 付费bug · 3810a089
  renjie authored Apr 20, 2020
  
  3810a089
15 Apr, 2020 19 commits
- Merge branch 'staging' into 'master' · 8c4d42d4
  Administrator authored Apr 15, 2020
```
Staging

See merge request !17
```
  8c4d42d4
- Staging · dc53301b
  renjie authored Apr 15, 2020
  
  dc53301b
- Merge branch 'dev-zrj' into 'staging' · e8275c10
  renjie authored Apr 15, 2020
```
注册bug

See merge request !16
```
  e8275c10
- 注册bug · 93309326
  renjie authored Apr 15, 2020
  
  93309326
- Merge branch 'dev-zrj' into 'staging' · 70d07d45
  renjie authored Apr 15, 2020
```
注册bug

See merge request !15
```
  70d07d45
- 注册bug · eb870dfd
  renjie authored Apr 15, 2020
  
  eb870dfd
- Merge branch 'dev-zrj' into 'staging' · 0ba4750e
  renjie authored Apr 15, 2020
```
企业认证添加公司名

See merge request !14
```
  0ba4750e
- 企业认证添加公司名 · 705b1d0a
  renjie authored Apr 15, 2020
  
  705b1d0a
- Merge branch 'dev-zrj' into 'staging' · 65c9982c
  renjie authored Apr 15, 2020
```
Dev zrj

See merge request !13
```
  65c9982c
- bug修改 · 2fe9d45b
  renjie authored Apr 15, 2020
  
  2fe9d45b
- bug修改 · 41861f27
  renjie authored Apr 15, 2020
  
  41861f27
- Merge branch 'dev-zrj' into 'staging' · 1c02aba5
  renjie authored Apr 15, 2020
```
bug修改

See merge request !12
```
  1c02aba5
- bug修改 · e6fee17d
  renjie authored Apr 15, 2020
  
  e6fee17d
- Merge branch 'dev-zrj' into 'staging' · 43c838e0
  renjie authored Apr 15, 2020
```
bug修改

See merge request !11
```
  43c838e0
- bug修改 · 3c0201b0
  renjie authored Apr 15, 2020
  
  3c0201b0
- Merge branch 'dev-zrj' into 'staging' · cc93604f
  renjie authored Apr 15, 2020
```
bug修改

See merge request !10
```
  cc93604f
- bug修改 · fe8008da
  renjie authored Apr 15, 2020
  
  fe8008da
- Merge branch 'dev-zrj' into 'staging' · 3a8148c6
  renjie authored Apr 15, 2020
```
bug修改

See merge request !9
```
  3a8148c6
- bug修改 · ab16a2c2
  renjie authored Apr 15, 2020
  
  ab16a2c2
14 Apr, 2020 15 commits
- Merge branch 'staging' into 'master' · 1cf6fd96
  renjie authored Apr 14, 2020
```
Staging

See merge request !8
```
  1cf6fd96
- Merge branch 'dev-zrj' into 'staging' · daa7c1bf
  renjie authored Apr 14, 2020
```
bug修改

See merge request !7
```
  daa7c1bf
- bug修改 · 6d404617
  renjie authored Apr 14, 2020
  
  6d404617
- Merge branch 'dev-zrj' into 'staging' · b974a331
  renjie authored Apr 14, 2020
```
推广礼金bug

See merge request !6
```
  b974a331
- 推广礼金bug · 840e792f
  renjie authored Apr 14, 2020
  
  840e792f
- Merge branch 'dev-zrj' into 'staging' · 68a2d3c0
  renjie authored Apr 14, 2020
```
admin更新

See merge request !5
```
  68a2d3c0
- admin更新 · b5d443a3
  renjie authored Apr 14, 2020
  
  b5d443a3
- Merge branch 'staging' into 'master' · 98a14d26
  renjie authored Apr 14, 2020
```
Staging

See merge request !4
```
  98a14d26
- Merge branch 'dev-zrj' into 'staging' · d0d7052d
  renjie authored Apr 14, 2020
```
Dev zrj

See merge request !3
```
  d0d7052d
- Merge remote-tracking branch 'browser-backend/dev-zrj' into dev-zrj · 93e35613
  renjie authored Apr 14, 2020
  
  93e35613
- build.sh更新 · 8af4a083
  renjie authored Apr 14, 2020
  
  8af4a083
- Merge branch 'staging' into 'master' · d454ad33
  renjie authored Apr 14, 2020
```
Staging

See merge request !2
```
  d454ad33
- Merge branch 'dev-zrj' into 'staging' · 668239d9
  renjie authored Apr 14, 2020
```
Dev zrj

See merge request !1
```
  668239d9
- Merge branch 'master' into 'dev-zrj' · 4a2ad2a1
  renjie authored Apr 14, 2020
```
# Conflicts:
#   src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java
```
  4a2ad2a1
- ip平台中文搜索 · a569639b
  renjie authored Apr 14, 2020
  
  a569639b
13 Apr, 2020 2 commits
- 支付宝支付bug · 6b4c9c8c
  renjie authored Apr 13, 2020
  
  6b4c9c8c
- admin bug · 032ff3c5
  renjie authored Apr 13, 2020
```
http请求超时时间
```
  032ff3c5