Commits · 08d8bd0c555b50db25164d6303e1a9cfca72598c · youjj / cloud-platform

14 Oct, 2019 14 commits
- Merge remote-tracking branch 'origin/dev' into dev · 08d8bd0c
  libin authored Oct 14, 2019
  
  08d8bd0c
- Merge branch 'master_activity' into dev · a167a16e
  hanfeng authored Oct 14, 2019
  
  a167a16e
- 修改图片批量上传 · 066fbf65
  hanfeng authored Oct 14, 2019
  
  066fbf65
- Merge branch 'master_activity' into dev · 18dee558
  hanfeng authored Oct 14, 2019
  
  18dee558
- 修改图片批量上传 · d9ca0f53
  hanfeng authored Oct 14, 2019
  
  d9ca0f53
- Merge branch 'master-auto-pay' into dev · 9e396b44
  libin authored Oct 14, 2019
  
  9e396b44
- 提现 · c85f2d0c
  libin authored Oct 14, 2019
  
  c85f2d0c
- Merge remote-tracking branch 'origin/dev' into dev · 5c75f9dd
  hanfeng authored Oct 14, 2019
  
  5c75f9dd
- Merge branch 'master_activity' into dev · 4f3bc86c
  hanfeng authored Oct 14, 2019
  
  4f3bc86c
- Merge remote-tracking branch 'origin/master_activity' into master_activity · ba0802ac
  hanfeng authored Oct 14, 2019
  
  ba0802ac
- 修改图片批量上传 · 1434dd54
  hanfeng authored Oct 14, 2019
  
  1434dd54
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 72c0b05f
  hezhen authored Oct 14, 2019
  
  72c0b05f
- Merge branch 'master_activity' into dev · 11cec7c9
  hezhen authored Oct 14, 2019
  
  11cec7c9
- 123 · 03af64ab
  hezhen authored Oct 14, 2019
  
  03af64ab
12 Oct, 2019 26 commits
- Merge branch 'master-auto-pay' into dev · 454bea64
  libin authored Oct 12, 2019
  
  454bea64
- 提现 · 705c2872
  libin authored Oct 12, 2019
  
  705c2872
- Merge branch 'master-auto-pay' into dev · 774f92aa
  libin authored Oct 12, 2019
  
  774f92aa
- 提现 · d5717da8
  libin authored Oct 12, 2019
  
  d5717da8
- Merge branch 'master-auto-pay' into dev · 034a4594
  libin authored Oct 12, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletBiz.java
```
  034a4594
- Merge branch 'master_member_level_feature' into dev · bce22ba1
  libin authored Oct 12, 2019
  
  bce22ba1
- 会员等级添加商品图片 · 0dffed2d
  libin authored Oct 12, 2019
  
  0dffed2d
- Merge branch 'master' into master_member_level_feature · b35fb148
  libin authored Oct 12, 2019
  
  b35fb148
- 提现 · 6055e6c1
  libin authored Oct 12, 2019
  
  6055e6c1
- Merge branch 'master-walletdetail' into dev · d0ab5ee3
  libin authored Oct 12, 2019
  
  d0ab5ee3
- 钱包明细 · 974410aa
  libin authored Oct 12, 2019
  
  974410aa
- Merge remote-tracking branch 'origin/master' into master-walletdetail · 881937e5
  libin authored Oct 12, 2019
  
  881937e5
- Merge remote-tracking branch 'origin/master' · 5d6e7f02
  libin authored Oct 12, 2019
  
  5d6e7f02
- Merge remote-tracking branch 'origin/dev' into dev · 931ed33c
  libin authored Oct 12, 2019
  
  931ed33c
- Merge branch 'master-walletdetail' into dev · 143bc191
  libin authored Oct 12, 2019
  
  143bc191
- 钱包明细 · dd4fb137
  libin authored Oct 12, 2019
  
  dd4fb137
- Merge branch 'master-order-statistics' into dev · 45819286
  hanfeng authored Oct 12, 2019
  
  45819286
- 修改订单统计 · 303f31bd
  hanfeng authored Oct 12, 2019
  
  303f31bd
- Merge branch 'dev' into master_activity-hf · cf1d0e48
  hanfeng authored Oct 12, 2019
  
  cf1d0e48
- Merge branch 'master_activity' of... · 2d8aaa9c
  hanfeng authored Oct 12, 2019
```
Merge branch 'master_activity' of http://113.105.137.151:22280/youjj/cloud-platform into master_activity-hf
```
  2d8aaa9c
- 修改订单统计 · eeede000
  hanfeng authored Oct 12, 2019
  
  eeede000
- Merge remote-tracking branch 'origin/dev' into dev · cd54c488
  hanfeng authored Oct 12, 2019
  
  cd54c488
- Merge branch 'master-order-statistics' into dev · e5483e03
  hanfeng authored Oct 12, 2019
  
  e5483e03
- 修改订单统计 · b742e507
  hanfeng authored Oct 12, 2019
  
  b742e507
- 修改订单统计 · 8d1e602d
  hanfeng authored Oct 12, 2019
  
  8d1e602d
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 63ba3c8a
  hezhen authored Oct 12, 2019
  
  63ba3c8a