Commits · 46ef9a5142aa3a27bf52bce4d290d7e67af6536d · youjj / cloud-platform

17 Jun, 2019 12 commits
- 修改报错 · 46ef9a51
  周健威 authored Jun 17, 2019
  
  46ef9a51
- Merge remote-tracking branch 'origin/base-modify' into base-modify · fef79c37
  周健威 authored Jun 17, 2019
  
  fef79c37
- 修改计价代码 · 85e17d67
  周健威 authored Jun 17, 2019
  
  85e17d67
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 0a1347c1
  libin authored Jun 17, 2019
  
  0a1347c1
- 根据token组装用户信息 · 97c240a3
  libin authored Jun 17, 2019
  
  97c240a3
- 营地项目创建 · 51ee40b9
  libin authored Jun 17, 2019
  
  51ee40b9
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 6eb8e941
  jiaorz authored Jun 17, 2019
  
  6eb8e941
- 营地项目创建 · 70a63529
  libin authored Jun 17, 2019
  
  70a63529
- 营地项目创建 · 5f30a6c6
  libin authored Jun 17, 2019
  
  5f30a6c6
- 营地项目创建 · 39cb6bb0
  libin authored Jun 17, 2019
  
  39cb6bb0
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · aa03d3bf
  hanfeng authored Jun 17, 2019
  
  aa03d3bf
- 修改车型标签 · da352f96
  hanfeng authored Jun 17, 2019
  
  da352f96
15 Jun, 2019 14 commits
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · df023f42
  jiaorz authored Jun 15, 2019
  
  df023f42
- 新增后台管理订单列表接口 · 0998f301
  jiaorz authored Jun 15, 2019
  
  0998f301
- Merge remote-tracking branch 'origin/base-modify' into base-modify · d7b6aa06
  周健威 authored Jun 15, 2019
  
  d7b6aa06
- 修改实体 · 5f84644e
  周健威 authored Jun 15, 2019
  
  5f84644e
- 修改实体 · b0b5f0dc
  周健威 authored Jun 15, 2019
  
  b0b5f0dc
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 4828f6f9
  libin authored Jun 15, 2019
  
  4828f6f9
- 旅游核销 · ac090024
  libin authored Jun 15, 2019
  
  ac090024
- 修改实体 · 7a6c70b5
  周健威 authored Jun 15, 2019
  
  7a6c70b5
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · b086526f
  hanfeng authored Jun 15, 2019
  
  b086526f
- 增加车型标签增加和修改功能 · 46c9f674
  hanfeng authored Jun 15, 2019
  
  46c9f674
- 修改实体 · 93302c81
  周健威 authored Jun 15, 2019
  
  93302c81
- 旅游核销 · 994d032c
  libin authored Jun 15, 2019
  
  994d032c
- 旅游核销 · c7b84f0a
  libin authored Jun 15, 2019
  
  c7b84f0a
- 旅游核销 · a88005e3
  libin authored Jun 15, 2019
  
  a88005e3
14 Jun, 2019 14 commits
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 956f49a1
  libin authored Jun 14, 2019
  
  956f49a1
- 添加核销模块 · cac91794
  hezhen authored Jun 14, 2019
  
  cac91794
- 旅游核销 · 16eaabd3
  libin authored Jun 14, 2019
  
  16eaabd3
- 旅游核销 · cea2377d
  libin authored Jun 14, 2019
  
  cea2377d
- 旅游核销 · aa48a0e5
  libin authored Jun 14, 2019
  
  aa48a0e5
- 旅游核销 · a6dbcad2
  libin authored Jun 14, 2019
  
  a6dbcad2
- 旅游核销 · 4621c7ea
  libin authored Jun 14, 2019
  
  4621c7ea
- 13 · a17165ef
  hezhen authored Jun 14, 2019
  
  a17165ef
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 86521ae1
  libin authored Jun 14, 2019
```
# Conflicts:
#	xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java
```
  86521ae1
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · dcc1647e
  libin authored Jun 14, 2019
```
# Conflicts:
#	xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java
```
  dcc1647e
- 旅游核销 · 65ffe662
  libin authored Jun 14, 2019
  
  65ffe662
- 旅游核销 · 960e6981
  libin authored Jun 14, 2019
  
  960e6981
- 修改 · 1dac6e43
  周健威 authored Jun 14, 2019
  
  1dac6e43
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 92bab3a6
  周健威 authored Jun 14, 2019
  
  92bab3a6