Commits · 69b288d7700cb3f27d7badb2615171379c0ca003 · youjj / cloud-platform

12 Jun, 2019 15 commits
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 69b288d7
  wuwz authored Jun 12, 2019
  
  69b288d7
- im · 2b91d960
  wuwz authored Jun 12, 2019
  
  2b91d960
- 修改检索bug · 3c6df288
  周健威 authored Jun 12, 2019
  
  3c6df288
- Merge remote-tracking branch 'origin/base-modify' into base-modify · a93c153f
  周健威 authored Jun 12, 2019
  
  a93c153f
- 修改检索bug · 89fa2103
  周健威 authored Jun 12, 2019
  
  89fa2103
- im · af4f2cc8
  wuwz authored Jun 12, 2019
  
  af4f2cc8
- 添加更新用户 · 3847d31f
  hezhen authored Jun 12, 2019
  
  3847d31f
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 34ee340d
  周健威 authored Jun 12, 2019
  
  34ee340d
- 修改热门检索 · 530baae6
  周健威 authored Jun 12, 2019
  
  530baae6
- 添加用户 · 429d7bd8
  hezhen authored Jun 12, 2019
  
  429d7bd8
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 1a93d8ac
  周健威 authored Jun 12, 2019
  
  1a93d8ac
- 修改取消bug · 7468fbb6
  周健威 authored Jun 12, 2019
  
  7468fbb6
- 代码生成模板*注释修改 · 4da900ea
  libin authored Jun 12, 2019
  
  4da900ea
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 7ceb6f01
  libin authored Jun 12, 2019
  
  7ceb6f01
- 后台*通用配置 · 1d5577ae
  libin authored Jun 12, 2019
  
  1d5577ae
11 Jun, 2019 20 commits
- 修改后台 · 34727395
  hezhen authored Jun 11, 2019
  
  34727395
- 修改后台 · 1535edf6
  hezhen authored Jun 11, 2019
  
  1535edf6
- 修改价格计算 · 3f5111c7
  hezhen authored Jun 11, 2019
  
  3f5111c7
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 3b96a003
  hezhen authored Jun 11, 2019
  
  3b96a003
- 添加旅游后台 · c9639195
  hezhen authored Jun 11, 2019
  
  c9639195
- 后台*旅游逻辑删除 · 784cd0c4
  libin authored Jun 11, 2019
  
  784cd0c4
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 49b66af6
  libin authored Jun 11, 2019
  
  49b66af6
- 添加get方法获取service 省去再次注入 · 824c5001
  libin authored Jun 11, 2019
  
  824c5001
- 后台*旅游标签接口 · 9c628d90
  libin authored Jun 11, 2019
  
  9c628d90
- Merge remote-tracking branch 'origin/base-modify' into base-modify · e263c01d
  周健威 authored Jun 11, 2019
  
  e263c01d
- 修改接口 · a2594ded
  周健威 authored Jun 11, 2019
  
  a2594ded
- 修改实名认证路径 · f88039a1
  youjj authored Jun 11, 2019
  
  f88039a1
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · f3006f5a
  youjj authored Jun 11, 2019
  
  f3006f5a
- 修改实名认证和旅游线路标签 · e4f7eafb
  youjj authored Jun 11, 2019
  
  e4f7eafb
- 修改可用车bug · cebefa57
  周健威 authored Jun 11, 2019
  
  cebefa57
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 98ed7ce7
  周健威 authored Jun 11, 2019
  
  98ed7ce7
- 修改订单 · 31184997
  周健威 authored Jun 11, 2019
  
  31184997
- 修改实名认证 · e0c44221
  youjj authored Jun 11, 2019
  
  e0c44221
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · d381be58
  hezhen authored Jun 11, 2019
  
  d381be58
- 添加后台 · 34b1dbde
  hezhen authored Jun 11, 2019
  
  34b1dbde
10 Jun, 2019 5 commits
- 修改订单 · c7a47532
  周健威 authored Jun 10, 2019
  
  c7a47532
- 修改订单 · 49e37879
  周健威 authored Jun 10, 2019
  
  49e37879
- 修改订单 · fcd059ab
  周健威 authored Jun 10, 2019
  
  fcd059ab
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 9f442a5f
  周健威 authored Jun 10, 2019
```
# Conflicts:
#	xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourUserController.java
```
  9f442a5f
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · c0d14070
  youjj authored Jun 10, 2019
```
# Conflicts:
#	xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBiz.java
```
  c0d14070