Commits · 2ff4f531ef434d2af5a47613cc3c91962d1a8cf6 · youjj / cloud-platform

26 Dec, 2019 4 commits
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 2ff4f531
  hezhen authored Dec 26, 2019
  
  2ff4f531
- Merge branch 'master-customer-management' into dev · c4cc64f0
  hezhen authored Dec 26, 2019
  
  c4cc64f0
- 123 · 98b487ce
  hezhen authored Dec 26, 2019
  
  98b487ce
- 123 · 6fc3064e
  hezhen authored Dec 26, 2019
  
  6fc3064e
25 Dec, 2019 12 commits
- Merge branch 'saff_update_feature' into dev · 5896ca72
  zuoyh authored Dec 25, 2019
  
  5896ca72
- 股東表插入、查詢 · 3ede7e03
  zuoyh authored Dec 25, 2019
  
  3ede7e03
- Merge branch 'saff_update_feature' into dev · 3447ab71
  zuoyh authored Dec 25, 2019
  
  3447ab71
- 股東表插入、查詢 · d367fc52
  zuoyh authored Dec 25, 2019
  
  d367fc52
- Merge remote-tracking branch 'origin/dev' into dev · 62089f10
  libin authored Dec 25, 2019
  
  62089f10
- Merge branch 'saff_update_feature' into dev · c0d7284f
  libin authored Dec 25, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
```
  c0d7284f
- 员工记录id · e93dd296
  libin authored Dec 25, 2019
  
  e93dd296
- 股東表插入、查詢 · 7f0b4c11
  zuoyh authored Dec 25, 2019
  
  7f0b4c11
- 股東表插入、查詢 · 5bf3327d
  zuoyh authored Dec 25, 2019
  
  5bf3327d
- 股東表插入、查詢 · d8cfcbb3
  zuoyh authored Dec 25, 2019
  
  d8cfcbb3
- Merge branch 'saff_update_feature' into dev · 34e9223e
  zuoyh authored Dec 25, 2019
  
  34e9223e
- 股東表插入、查詢 · b8b3dba9
  zuoyh authored Dec 25, 2019
  
  b8b3dba9
24 Dec, 2019 24 commits
- 股東表插入、查詢 · 2011e08c
  zuoyh authored Dec 24, 2019
  
  2011e08c
- Merge branch 'saff_update_feature' into dev · 3bdc9a18
  zuoyh authored Dec 24, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java
```
  3bdc9a18
- 股東表插入、查詢 · 841b3509
  zuoyh authored Dec 24, 2019
  
  841b3509
- 股東表插入、查詢 · 4e051993
  zuoyh authored Dec 24, 2019
  
  4e051993
- 股東表插入、查詢 · ea807191
  zuoyh authored Dec 24, 2019
  
  ea807191
- Merge branch 'saff_update_feature' into dev · 1f1fbd37
  zuoyh authored Dec 24, 2019
  
  1f1fbd37
- 股東表插入、查詢 · 72966d6b
  zuoyh authored Dec 24, 2019
  
  72966d6b
- 股東表插入、查詢 · 064163c0
  zuoyh authored Dec 24, 2019
  
  064163c0
- Merge branch 'saff_update_feature' into dev · a6925ecf
  zuoyh authored Dec 24, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailBiz.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppShareholderDetailMapper.xml
```
  a6925ecf
- 股東表插入、查詢 · a7f5c305
  zuoyh authored Dec 24, 2019
  
  a7f5c305
- 股東表插入、查詢 · c033c626
  zuoyh authored Dec 24, 2019
  
  c033c626
- Merge branch 'saff_update_feature' into dev · 8029d7c2
  zuoyh authored Dec 24, 2019
  
  8029d7c2
- 股東表插入、查詢 · ac46a04f
  zuoyh authored Dec 24, 2019
  
  ac46a04f
- 股東表插入、查詢 · c184119f
  zuoyh authored Dec 24, 2019
  
  c184119f
- 股東表插入、查詢 · aecc55ff
  zuoyh authored Dec 24, 2019
  
  aecc55ff
- 股東表插入、查詢 · cde40bfc
  zuoyh authored Dec 24, 2019
  
  cde40bfc
- Merge branch 'saff_update_feature' into dev · ba7fdea5
  zuoyh authored Dec 24, 2019
  
  ba7fdea5
- 股東表插入、查詢 · 862d95b1
  zuoyh authored Dec 24, 2019
  
  862d95b1
- 股東表插入、查詢 · 0b825178
  zuoyh authored Dec 24, 2019
  
  0b825178
- Merge branch 'saff_update_feature' into dev · 920f8df3
  zuoyh authored Dec 24, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
```
  920f8df3
- 股東表插入、查詢 · 44b35895
  zuoyh authored Dec 24, 2019
  
  44b35895
- 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