Commits · 8c4d42d4648113a79a29ad31c6f10bd9537aed15 · Administrator / browser-backend

15 Apr, 2020 2 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
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
11 Apr, 2020 7 commits
- invite code · aa2969e1
  jim authored Apr 11, 2020
  
  aa2969e1
- error · 3ad8d2b4
  jim authored Apr 11, 2020
  
  3ad8d2b4
- pom · 58bd9f86
  jim authored Apr 11, 2020
  
  58bd9f86
- pom · 3d6d996f
  jim authored Apr 11, 2020
  
  3d6d996f
- 注册用户发短信 · 4d090d85
  renjie authored Apr 11, 2020
  
  4d090d85
- admin接口 · 25401d34
  renjie authored Apr 11, 2020
  
  25401d34
- admin接口 · 1939c414
  renjie authored Apr 11, 2020
  
  1939c414
09 Apr, 2020 5 commits
- ip数量统计 · 4cdeb0e2
  renjie authored Apr 09, 2020
  
  4cdeb0e2
- 认证资格设置 · ba2f33d5
  renjie authored Apr 09, 2020
  
  ba2f33d5
- ip过期短信 · 90d548b4
  renjie authored Apr 09, 2020
  
  90d548b4
- 公司月报 · c36fac64
  renjie authored Apr 09, 2020
```
企业认证bug
```
  c36fac64
- admin接口 · 34530148
  renjie authored Apr 09, 2020
```
推广礼金提现
```
  34530148
08 Apr, 2020 9 commits
- 账单bug · 7e4e6398
  renjie authored Apr 08, 2020
  
  7e4e6398
- 修改推广码 · 2efbb398
  renjie authored Apr 08, 2020
  
  2efbb398
- 推广礼金 · 4555b949
  renjie authored Apr 08, 2020
  
  4555b949
- 支付宝支付 · 403e8582
  renjie authored Apr 08, 2020
  
  403e8582
- 支付宝支付 · 4809e0dd
  renjie authored Apr 08, 2020
  
  4809e0dd
- 支付宝支付 · d936e130
  renjie authored Apr 08, 2020
  
  d936e130
- 支付宝支付 · e6afc34d
  renjie authored Apr 08, 2020
  
  e6afc34d
- 支付宝支付check修改 · 5e9f3d0b
  renjie authored Apr 08, 2020
  
  5e9f3d0b
- url修改 · da8a470e
  renjie authored Apr 08, 2020
  
  da8a470e