Commits · 9db657359f39f3aeb88f342e54c9a85226f0ab41 · youjj / cloud-platform

19 Dec, 2019 1 commit
- Merge branch 'master-bug-vehiclemodel-hf' into dev · 9db65735
  hanfeng authored Dec 19, 2019
  
  9db65735
18 Dec, 2019 27 commits
- 员工信息修改_复职修改 · d6ae3a9b
  zuoyh authored Dec 18, 2019
  
  d6ae3a9b
- 员工信息修改_复职修改 · ffbdeefd
  zuoyh authored Dec 18, 2019
  
  ffbdeefd
- Merge remote-tracking branch 'origin/dev' into dev · 1dc7901e
  zuoyh authored Dec 18, 2019
  
  1dc7901e
- Merge branch 'master-activity-bk' into dev · db1735c9
  jiaorz authored Dec 18, 2019
  
  db1735c9
- 修改活动bug · 60aa2a01
  jiaorz authored Dec 18, 2019
  
  60aa2a01
- Merge branch 'feature-emploee-upd' into dev · f61a9bd1
  zuoyh authored Dec 18, 2019
  
  f61a9bd1
- 员工信息修改_复职修改 · 6ab6cc5c
  zuoyh authored Dec 18, 2019
  
  6ab6cc5c
- 员工信息修改_复职 · 6e715f1a
  zuoyh authored Dec 18, 2019
  
  6e715f1a
- Merge branch 'feature-emploee-upd' into dev · c3fae662
  zuoyh authored Dec 18, 2019
  
  c3fae662
- 员工信息修改_复职 · bb6e2287
  zuoyh authored Dec 18, 2019
  
  bb6e2287
- Merge remote-tracking branch 'origin/dev' into dev · 3dbdf86c
  jiaorz authored Dec 18, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java
```
  3dbdf86c
- Merge branch 'master-activity-bk' into dev · dd7a9d63
  jiaorz authored Dec 18, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java
#	xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java
```
  dd7a9d63
- 修改活动bug · 3622479a
  jiaorz authored Dec 18, 2019
  
  3622479a
- Merge branch 'feature-emploee-upd' into dev · ef446c85
  zuoyh authored Dec 18, 2019
  
  ef446c85
- 员工信息修改_复职 · e5a0c39c
  zuoyh authored Dec 18, 2019
  
  e5a0c39c
- Merge branch 'master' of http://113.105.137.151:22280/youjj/cloud-platform · 0aee91fc
  hezhen authored Dec 18, 2019
  
  0aee91fc
- 123 · 00c4f321
  hezhen authored Dec 18, 2019
  
  00c4f321
- 字典 · 179d70c2
  libin authored Dec 18, 2019
  
  179d70c2
- Merge branch 'master' of http://113.105.137.151:22280/youjj/cloud-platform · a33ec3c1
  hezhen authored Dec 18, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppStaffUserBiz.java
```
  a33ec3c1
- 123 · 029b5822
  hezhen authored Dec 18, 2019
  
  029b5822
- Merge branch 'master-customer-management' · f0c42984
  hanfeng authored Dec 18, 2019
  
  f0c42984
- 修改客户管理 · 062a1eb4
  hanfeng authored Dec 18, 2019
  
  062a1eb4
- 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
- Merge branch 'master-customer-management' into dev · 9f013ba8
  hanfeng authored Dec 18, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java
```
  9f013ba8
- 修改客户管理 · 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 12 commits
- Merge branch 'master-customer-management' into dev · 57702f43
  hanfeng authored Dec 17, 2019
  
  57702f43
- 修改客户管理 · a416a068
  hanfeng authored Dec 17, 2019
  
  a416a068
- Merge branch 'master-customer-management' into dev · 86eb8295
  hanfeng authored Dec 17, 2019
  
  86eb8295
- 修改客户管理 · 77eb235d
  hanfeng authored Dec 17, 2019
  
  77eb235d
- Merge branch 'master-customer-management' into dev · b176bcbc
  hanfeng authored Dec 17, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppStaffUserBiz.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java
```
  b176bcbc
- 修改客户管理 · 617d3b30
  hanfeng authored Dec 17, 2019
  
  617d3b30
- 修改客户管理 · 397a2c55
  hanfeng authored Dec 17, 2019
  
  397a2c55
- Merge branch 'master-customer-management' into dev · a1cedce4
  hanfeng authored Dec 17, 2019
  
  a1cedce4
- 修改客户管理 · 1e8a4014
  hanfeng authored Dec 17, 2019
  
  1e8a4014
- Merge branch 'master-customer-management' into dev · c4a88a37
  hanfeng authored Dec 17, 2019
  
  c4a88a37
- 修改客户管理 · 574d1c29
  hanfeng authored Dec 17, 2019
  
  574d1c29
- Merge remote-tracking branch 'origin/dev' into dev · 61adefac
  hanfeng authored Dec 17, 2019
  
  61adefac