Commits · 88a20d89b281c664a6861f4313e03db919680095 · youjj / cloud-platform

18 Dec, 2019 4 commits
- Merge branch 'master-customer-management' · 88a20d89
  hanfeng authored Dec 18, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java
```
  88a20d89
- 修改客户管理 · f6425a20
  hanfeng authored Dec 18, 2019
  
  f6425a20
- Merge remote-tracking branch 'origin/master-customer-management' into master-customer-management · 5a7e79b6
  hanfeng authored Dec 18, 2019
  
  5a7e79b6
- 123 · 5d8b3090
  hezhen authored Dec 18, 2019
  
  5d8b3090
17 Dec, 2019 16 commits
- 修改客户管理 · a416a068
  hanfeng authored Dec 17, 2019
  
  a416a068
- 修改客户管理 · 77eb235d
  hanfeng authored Dec 17, 2019
  
  77eb235d
- 修改客户管理 · 617d3b30
  hanfeng authored Dec 17, 2019
  
  617d3b30
- 修改客户管理 · 1e8a4014
  hanfeng authored Dec 17, 2019
  
  1e8a4014
- 修改客户管理 · 574d1c29
  hanfeng authored Dec 17, 2019
  
  574d1c29
- 修改客户管理 · ce219f99
  hanfeng authored Dec 17, 2019
  
  ce219f99
- Merge remote-tracking branch 'origin/master-customer-management' into master-customer-management · a7eb3725
  hanfeng authored Dec 17, 2019
  
  a7eb3725
- 123 · 4da10060
  hezhen authored Dec 17, 2019
  
  4da10060
- 修改客户管理 · c5a62120
  hanfeng authored Dec 17, 2019
  
  c5a62120
- 修改客户管理 · 42aaa841
  hanfeng authored Dec 17, 2019
  
  42aaa841
- 修改客户管理 · f1ce775f
  hanfeng authored Dec 17, 2019
  
  f1ce775f
- 修改客户管理 · a4bebd2e
  hanfeng authored Dec 17, 2019
  
  a4bebd2e
- 修改客户管理 · 079e6982
  hanfeng authored Dec 17, 2019
  
  079e6982
- 修改客户管理 · fc9239d7
  hanfeng authored Dec 17, 2019
  
  fc9239d7
- 修改客户管理 · d1589229
  hanfeng authored Dec 17, 2019
  
  d1589229
- 修改客户管理 · d02d0aaa
  hanfeng authored Dec 17, 2019
  
  d02d0aaa
16 Dec, 2019 1 commit
- 修改客户管理 · a6192428
  hanfeng authored Dec 16, 2019
  
  a6192428
13 Dec, 2019 18 commits
- Merge remote-tracking branch 'origin/master' · 316ed6fb
  hanfeng authored Dec 13, 2019
  
  316ed6fb
- Merge branch 'master-customer-management' · 4240be83
  hanfeng authored Dec 13, 2019
  
  4240be83
- 精彩活动添加字段 · 0ca5aab8
  hanfeng authored Dec 13, 2019
  
  0ca5aab8
- Merge remote-tracking branch 'origin/master' · 07c54b88
  libin authored Dec 13, 2019
  
  07c54b88
- Merge branch 'luck_draw_feature' · 73321be5
  libin authored Dec 13, 2019
  
  73321be5
- Merge branch 'master' of http://113.105.137.151:22280/youjj/cloud-platform · d87532eb
  hezhen authored Dec 13, 2019
  
  d87532eb
- Merge branch 'master_guanjia' · 2a9e22c0
  hezhen authored Dec 13, 2019
  
  2a9e22c0
- Merge remote-tracking branch 'origin/master' · 8e22eff9
  hanfeng authored Dec 13, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java
```
  8e22eff9
- Merge branch 'master-customer-management' · 18052b78
  hanfeng authored Dec 13, 2019
  
  18052b78
- Merge branch 'master-bug-vehiclemodel-hf' · 452c82b0
  hanfeng authored Dec 13, 2019
  
  452c82b0
- 添加根据中奖记录id查询的接口 · 64eaa146
  libin authored Dec 13, 2019
  
  64eaa146
- 精彩活动添加字段 · d684faab
  hanfeng authored Dec 13, 2019
  
  d684faab
- banner添加小程序url跳转字段，抽奖奖品库存与发送奖品修改换成异步处理(rabbitmq) · 17c72286
  libin authored Dec 13, 2019
  
  17c72286
- 精彩活动添加字段 · c9e018b2
  hanfeng authored Dec 13, 2019
  
  c9e018b2
- 客户管理日志 · 94d4afaa
  hanfeng authored Dec 13, 2019
  
  94d4afaa
- 客户管理日志 · 140ccc90
  hanfeng authored Dec 13, 2019
  
  140ccc90
- 客户管理日志 · 91287a1e
  hanfeng authored Dec 13, 2019
  
  91287a1e
- 客户管理日志 · b33c1d66
  hanfeng authored Dec 13, 2019
  
  b33c1d66
12 Dec, 2019 1 commit
- Merge branch 'order_received_statistics' · f7319951
  libin authored Dec 12, 2019
  
  f7319951