Commits · c7ce55893d1157c0b5ec7300b3b48cbd930b394a · youjj / cloud-platform

19 Dec, 2019 40 commits
- 员工信息修改_APP用户列表联动更新 · c7ce5589
  zuoyh authored Dec 19, 2019
  
  c7ce5589
- Merge branch 'feature-emploee-upd' into dev · 66b4981b
  zuoyh authored Dec 19, 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/rest/AppUsersManageController.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java
```
  66b4981b
- 员工信息修改_APP用户列表联动更新 · 78b51194
  zuoyh authored Dec 19, 2019
  
  78b51194
- Merge branch 'master-bug-vehiclemodel-hf' into dev · e380593b
  hanfeng authored Dec 19, 2019
  
  e380593b
- app下载记录 · ff5bac93
  hanfeng authored Dec 19, 2019
  
  ff5bac93
- Merge branch 'master-bug-vehiclemodel-hf' into dev · 765d1f77
  hanfeng authored Dec 19, 2019
  
  765d1f77
- app下载记录 · f914bcfd
  hanfeng authored Dec 19, 2019
  
  f914bcfd
- Merge branch 'master-bug-vehiclemodel-hf' into dev · c1a71ea0
  hanfeng authored Dec 19, 2019
  
  c1a71ea0
- app下载记录 · 518775c7
  hanfeng authored Dec 19, 2019
  
  518775c7
- Merge remote-tracking branch 'origin/dev' into dev · 7859c49b
  hanfeng authored Dec 19, 2019
  
  7859c49b
- Merge branch 'master-bug-vehiclemodel-hf' into dev · 9ea11b63
  hanfeng authored Dec 19, 2019
  
  9ea11b63
- app下载记录 · 91796dc0
  hanfeng authored Dec 19, 2019
  
  91796dc0
- Merge branch 'master-bug-vehiclemodel-hf' into dev · db41dcdf
  hanfeng authored Dec 19, 2019
  
  db41dcdf
- 123 · 91b511d8
  hanfeng authored Dec 19, 2019
  
  91b511d8
- Merge branch 'master-activity-bk' into dev · ee2c3d12
  jiaorz authored Dec 19, 2019
  
  ee2c3d12
- 修改活动bug · 79562613
  jiaorz authored Dec 19, 2019
  
  79562613
- Merge branch 'master-bug-vehiclemodel-hf' into dev · c6eceaf5
  hanfeng authored Dec 19, 2019
  
  c6eceaf5
- 123 · 2fff72f9
  hanfeng authored Dec 19, 2019
  
  2fff72f9
- 修改客户管理 · 08d714b1
  hanfeng authored Dec 19, 2019
  
  08d714b1
- Merge remote-tracking branch 'origin/dev' into dev · 61fb179d
  hanfeng authored Dec 19, 2019
  
  61fb179d
- Merge branch 'master-bug-vehiclemodel-hf' into dev · 9db65735
  hanfeng authored Dec 19, 2019
  
  9db65735
- Merge branch 'order_received_statistics' into dev · 389e6e31
  libin authored Dec 19, 2019
  
  389e6e31
- 订单日统计日期处理 · 0d61c47e
  libin authored Dec 19, 2019
  
  0d61c47e
- Merge branch 'order_received_statistics' into dev · 8f95254c
  libin authored Dec 19, 2019
  
  8f95254c
- 订单日统计日期处理 · 09364ce3
  libin authored Dec 19, 2019
  
  09364ce3
- Merge branch 'order_received_statistics' into dev · f1c543a7
  libin authored Dec 19, 2019
  
  f1c543a7
- 订单日统计日期处理 · be6c383b
  libin authored Dec 19, 2019
  
  be6c383b
- Merge branch 'order_received_statistics' into dev · 40373bbe
  libin authored Dec 19, 2019
  
  40373bbe
- 订单概况统计排序 · 95296ad2
  libin authored Dec 19, 2019
  
  95296ad2
- Merge branch 'master-activity-bk' · 4f39de4e
  jiaorz authored Dec 19, 2019
  
  4f39de4e
- Merge branch 'master-customer-management' into dev · c3f5d0af
  hezhen authored Dec 19, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java
```
  c3f5d0af
- 123 · 06453fa3
  hezhen authored Dec 19, 2019
  
  06453fa3
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 03fee680
  hezhen authored Dec 19, 2019
  
  03fee680
- Merge branch 'master-customer-management' into dev · 4d0f80a0
  hezhen authored Dec 19, 2019
  
  4d0f80a0
- 123 · 7722e325
  hezhen authored Dec 19, 2019
  
  7722e325
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · e74efa95
  hezhen authored Dec 19, 2019
  
  e74efa95
- Merge branch 'master-customer-management' into dev · c3ce7061
  hezhen authored Dec 19, 2019
  
  c3ce7061
- 123 · fd50cc09
  hezhen authored Dec 19, 2019
  
  fd50cc09
- Merge branch 'master-activity-bk' into dev · 1ccd7073
  jiaorz authored Dec 19, 2019
  
  1ccd7073
- 修改活动bug · 48ad304b
  jiaorz authored Dec 19, 2019
  
  48ad304b