Commits · 4dfd4444ee72fc436eaed158d5ed71ce60c2474e · youjj / cloud-platform

12 Dec, 2019 22 commits
- Merge branch 'master-customer-management' into dev · 4dfd4444
  hanfeng authored Dec 12, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java
```
  4dfd4444
- 客户管理 · b20e7577
  hanfeng authored Dec 12, 2019
  
  b20e7577
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 84e77f20
  hezhen authored Dec 12, 2019
  
  84e77f20
- Merge branch 'master_position' into dev · e3fcdb28
  hezhen authored Dec 12, 2019
  
  e3fcdb28
- 123 · e29df43d
  hezhen authored Dec 12, 2019
  
  e29df43d
- Merge remote-tracking branch 'origin/dev' into dev · 8c6a4d04
  jiaorz authored Dec 12, 2019
  
  8c6a4d04
- 活动修改 · 55338ef0
  jiaorz authored Dec 12, 2019
  
  55338ef0
- Merge remote-tracking branch 'origin/dev' into dev · 37c5a2db
  libin authored Dec 12, 2019
  
  37c5a2db
- Merge branch 'luck_draw_feature' into dev · 8203ea47
  libin authored Dec 12, 2019
  
  8203ea47
- 活动弹窗修改 · 111e1a38
  libin authored Dec 12, 2019
  
  111e1a38
- Merge remote-tracking branch 'origin/dev' into dev · a0a4fbbc
  jiaorz authored Dec 12, 2019
  
  a0a4fbbc
- Merge branch 'luck_draw_feature' into dev · d25bd5bc
  jiaorz authored Dec 12, 2019
  
  d25bd5bc
- 活动修改 · f0ddccb3
  jiaorz authored Dec 12, 2019
  
  f0ddccb3
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · b2a0976d
  hezhen authored Dec 12, 2019
  
  b2a0976d
- 123 · 2cbbf54d
  hezhen authored Dec 12, 2019
  
  2cbbf54d
- 1 · 7f5ce94a
  jiaorz authored Dec 12, 2019
  
  7f5ce94a
- Merge branch 'master-vehicle-count-bug' into dev · 419ba1c3
  jiaorz authored Dec 12, 2019
  
  419ba1c3
- 1 · f2238eec
  jiaorz authored Dec 12, 2019
  
  f2238eec
- Merge remote-tracking branch 'origin/dev' into dev · 7d0f5d48
  jiaorz authored Dec 12, 2019
  
  7d0f5d48
- Merge branch 'luck_draw_feature' into dev · 2dd553e9
  jiaorz authored Dec 12, 2019
  
  2dd553e9
- 获取用户是否参加活动 · 2379cd6d
  jiaorz authored Dec 12, 2019
  
  2379cd6d
- Merge remote-tracking branch 'origin/luck_draw_feature' into luck_draw_feature · 3bb1d77a
  libin authored Dec 12, 2019
  
  3bb1d77a
11 Dec, 2019 18 commits
- Merge remote-tracking branch 'origin/dev' into dev · 0049ace0
  libin authored Dec 11, 2019
  
  0049ace0
- 数据清除 · 0382b81a
  libin authored Dec 11, 2019
  
  0382b81a
- Merge remote-tracking branch 'origin/dev' into dev · dbdbe1bb
  周健威 authored Dec 11, 2019
  
  dbdbe1bb
- Merge branch 'master-zjw' into dev · 9b6b6c8b
  周健威 authored Dec 11, 2019
  
  9b6b6c8b
- 修改bug · 280f53ed
  周健威 authored Dec 11, 2019
  
  280f53ed
- Merge branch 'luck_draw_feature' into dev · d135e977
  jiaorz authored Dec 11, 2019
  
  d135e977
- 修改bug · d1c6b6b7
  周健威 authored Dec 11, 2019
  
  d1c6b6b7
- 获取用户是否参加活动 · 5c3bb949
  jiaorz authored Dec 11, 2019
  
  5c3bb949
- 获取用户是否参加活动 · adfca6dc
  jiaorz authored Dec 11, 2019
  
  adfca6dc
- Merge branch 'master' into master-zjw · d6059745
  周健威 authored Dec 11, 2019
  
  d6059745
- Merge branch 'luck_draw_feature' into dev · 444d3278
  jiaorz authored Dec 11, 2019
  
  444d3278
- 获取用户是否参加活动 · 0ff83005
  jiaorz authored Dec 11, 2019
  
  0ff83005
- Merge branch 'luck_draw_feature' into dev · 6a179605
  jiaorz authored Dec 11, 2019
```
# Conflicts:
#	xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeRelationBiz.java
```
  6a179605
- 获取用户是否参加活动 · 1ddb2d41
  jiaorz authored Dec 11, 2019
  
  1ddb2d41
- 获取用户是否参加活动 · 7bda5531
  jiaorz authored Dec 11, 2019
  
  7bda5531
- 获取用户是否参加活动 · 57951bab
  jiaorz authored Dec 11, 2019
  
  57951bab
- 获取用户是否参加活动 · cc37acac
  jiaorz authored Dec 11, 2019
  
  cc37acac
- 获取用户是否参加活动 · 7c3925ec
  jiaorz authored Dec 11, 2019
  
  7c3925ec