Commits · aa03d3bfd1b47a2c44cb801e63b7f25899932c8a · youjj / cloud-platform

17 Jun, 2019 2 commits
- 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 12 commits
- 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 26 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
- 修改 · d31ad520
  周健威 authored Jun 14, 2019
  
  d31ad520
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 56b174e3
  libin authored Jun 14, 2019
  
  56b174e3
- 旅游标签 · 55797988
  libin authored Jun 14, 2019
  
  55797988
- Merge remote-tracking branch 'origin/base-modify' into base-modify · ad0b7117
  周健威 authored Jun 14, 2019
  
  ad0b7117
- 修改旅游订单详情 · 216cdda5
  周健威 authored Jun 14, 2019
  
  216cdda5
- 核销 · 33b00814
  libin authored Jun 14, 2019
  
  33b00814
- 核销批量插入 · 2cec36d3
  libin authored Jun 14, 2019
  
  2cec36d3
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · ff4a5ebd
  libin authored Jun 14, 2019
  
  ff4a5ebd
- 核销 · a69d75f6
  libin authored Jun 14, 2019
  
  a69d75f6
- 修改编辑 · bce3f156
  hezhen authored Jun 14, 2019
  
  bce3f156
- 核销 · 725372b9
  libin authored Jun 14, 2019
  
  725372b9
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 8da301ec
  hezhen authored Jun 14, 2019
  
  8da301ec