Commits · 09ee2ade38d9686748c4be763962431feb34c9c0 · youjj / cloud-platform

24 Dec, 2019 11 commits
- Merge branch 'master-captcha-branch' into dev · 09ee2ade
  jiaorz authored Dec 24, 2019
  
  09ee2ade
- 活动记录 · f963c856
  jiaorz authored Dec 24, 2019
  
  f963c856
- Merge branch 'master-captcha-branch' into dev · 7195e977
  jiaorz authored Dec 24, 2019
  
  7195e977
- 活动记录 · c32e1a8b
  jiaorz authored Dec 24, 2019
  
  c32e1a8b
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 337a06ea
  hezhen authored Dec 24, 2019
  
  337a06ea
- Merge branch 'master-customer-management' into dev · bf55b610
  hezhen authored Dec 24, 2019
  
  bf55b610
- 123 · df525ee7
  hezhen authored Dec 24, 2019
  
  df525ee7
- 活动记录 · 636289c9
  jiaorz authored Dec 24, 2019
  
  636289c9
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 82fcad23
  hezhen authored Dec 24, 2019
  
  82fcad23
- Merge branch 'master-customer-management' into dev · 4e169c9c
  hezhen authored Dec 24, 2019
```
# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/constant/RedisKey.java
```
  4e169c9c
- 123 · a01d58ca
  hezhen authored Dec 24, 2019
  
  a01d58ca
23 Dec, 2019 22 commits
- Merge branch 'saff_update_feature' into dev · c5233d1a
  libin authored Dec 23, 2019
  
  c5233d1a
- 员工，股东身份修改 · 7bac4337
  libin authored Dec 23, 2019
  
  7bac4337
- 员工，股东身份修改 · 8a03fa41
  libin authored Dec 23, 2019
  
  8a03fa41
- Merge remote-tracking branch 'origin/saff_update_feature' into saff_update_feature · 4db72bf0
  libin authored Dec 23, 2019
  
  4db72bf0
- 股東表插入、查詢 · 0f67294d
  zuoyh authored Dec 23, 2019
  
  0f67294d
- 股東表插入、查詢 · 90ddac90
  zuoyh authored Dec 23, 2019
  
  90ddac90
- Merge branch 'order_received_statistics' into dev · 08b27cb2
  libin authored Dec 23, 2019
  
  08b27cb2
- 会员标识名修改 · 8a11a5b0
  libin authored Dec 23, 2019
  
  8a11a5b0
- Merge branch 'order_received_statistics' into dev · 7efe8b1a
  libin authored Dec 23, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderReceivedStatisticsAdminController.java
```
  7efe8b1a
- excel导出bug修复 · cea7190f
  libin authored Dec 23, 2019
  
  cea7190f
- Merge branch 'saff_update_feature' into dev · a858ddd3
  libin authored Dec 23, 2019
  
  a858ddd3
- 股東表插入、查詢 · 86362a22
  zuoyh authored Dec 23, 2019
  
  86362a22
- Merge remote-tracking branch 'origin/saff_update_feature' into saff_update_feature · cd6a62f6
  libin authored Dec 23, 2019
  
  cd6a62f6
- 字段修改 · d75cae77
  libin authored Dec 23, 2019
  
  d75cae77
- 股東表插入、查詢 · 99e506ed
  zuoyh authored Dec 23, 2019
  
  99e506ed
- Merge branch 'master-captcha-branch' into dev · 87636589
  jiaorz authored Dec 23, 2019
  
  87636589
- 活动记录 · a461742d
  jiaorz authored Dec 23, 2019
  
  a461742d
- 活动记录 · 7442fe72
  jiaorz authored Dec 23, 2019
  
  7442fe72
- Merge branch 'master-captcha-branch' into dev · a03b547b
  jiaorz authored Dec 23, 2019
  
  a03b547b
- 活动记录 · be40f288
  jiaorz authored Dec 23, 2019
  
  be40f288
- 活动记录 · ed9e789a
  jiaorz authored Dec 23, 2019
  
  ed9e789a
- Merge branch 'saff_update_feature' of E:\NowCodes\XXProjectCode\xxWorkSpace with conflicts. · 30a3c028
  zuoyh authored Dec 23, 2019
  
  30a3c028
22 Dec, 2019 7 commits
- Merge branch 'saff_update_feature' into dev · a2d65152
  libin authored Dec 22, 2019
  
  a2d65152
- Merge branch 'order_received_statistics' into dev · fe249aaa
  libin authored Dec 22, 2019
  
  fe249aaa
- 分公司业绩 · 69acbff8
  libin authored Dec 22, 2019
  
  69acbff8
- 用户身份信息修改 · fa230732
  libin authored Dec 22, 2019
  
  fa230732
- Merge branch 'order_received_statistics' into dev · f57f80e9
  libin authored Dec 22, 2019
  
  f57f80e9
- 订单统计概况修改 · 6de1d0ef
  libin authored Dec 22, 2019
  
  6de1d0ef
- 订单统计概况修改 · d8a72079
  libin authored Dec 22, 2019
  
  d8a72079