Commits · 14b0f5e8d1e1f330ff5b1cc1002232c828b806fd · youjj / cloud-platform

27 Jun, 2019 6 commits
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 14b0f5e8
  hezhen authored Jun 27, 2019
  
  14b0f5e8
- 123 · 759b8e2c
  hezhen authored Jun 27, 2019
  
  759b8e2c
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · e62b0829
  hanfeng authored Jun 27, 2019
  
  e62b0829
- 修改违章,增加bean · dda16cfa
  hanfeng authored Jun 27, 2019
  
  dda16cfa
- Merge remote-tracking branch 'origin/base-modify' into base-modify · d31de4a9
  周健威 authored Jun 27, 2019
  
  d31de4a9
- 修改优惠券和会员bug · 0ea8dd8d
  周健威 authored Jun 27, 2019
  
  0ea8dd8d
26 Jun, 2019 34 commits
- 123 · 573d0cbe
  hezhen authored Jun 26, 2019
  
  573d0cbe
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · caa63d8f
  hezhen authored Jun 26, 2019
  
  caa63d8f
- 123 · b5de0927
  hezhen authored Jun 26, 2019
  
  b5de0927
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · a5ec13d6
  libin authored Jun 26, 2019
  
  a5ec13d6
- token 设置 · 1aeb545a
  libin authored Jun 26, 2019
  
  1aeb545a
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · f58a5586
  hezhen authored Jun 26, 2019
  
  f58a5586
- 123 · 7b89d5e9
  hezhen authored Jun 26, 2019
  
  7b89d5e9
- banner · d3d5d18e
  libin authored Jun 26, 2019
  
  d3d5d18e
- 修改违章 · 1a3e4ed3
  hanfeng authored Jun 26, 2019
  
  1a3e4ed3
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 36aa95e9
  libin authored Jun 26, 2019
  
  36aa95e9
- 营地 · 1f9e1ce2
  libin authored Jun 26, 2019
  
  1f9e1ce2
- 修改违章2 · 76cf6c7b
  hanfeng authored Jun 26, 2019
  
  76cf6c7b
- 123 · a5b8966c
  hezhen authored Jun 26, 2019
  
  a5b8966c
- 123 · d306c6ab
  hezhen authored Jun 26, 2019
  
  d306c6ab
- 123 · 8092aa74
  hezhen authored Jun 26, 2019
  
  8092aa74
- 新增问题模块接口 · 15d3ab44
  jiaorz authored Jun 26, 2019
  
  15d3ab44
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 8c3fa797
  hanfeng authored Jun 26, 2019
  
  8c3fa797
- 新增问题模块接口 · 9056c04f
  jiaorz authored Jun 26, 2019
  
  9056c04f
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 300b34ba
  hezhen authored Jun 26, 2019
  
  300b34ba
- 123 · 16f06aef
  hezhen authored Jun 26, 2019
  
  16f06aef
- app main 修改 · 2539b62b
  libin authored Jun 26, 2019
  
  2539b62b
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 18202b08
  hanfeng authored Jun 26, 2019
  
  18202b08
- 修改违章 · e9e206cc
  hanfeng authored Jun 26, 2019
  
  e9e206cc
- 参数 · c9648182
  libin authored Jun 26, 2019
  
  c9648182
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · c99bba0c
  libin authored Jun 26, 2019
  
  c99bba0c
- banner · 5dc42ec5
  libin authored Jun 26, 2019
  
  5dc42ec5
- 123 · fb4b402e
  hezhen authored Jun 26, 2019
  
  fb4b402e
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 2758e544
  hezhen authored Jun 26, 2019
  
  2758e544
- 123 · fd24fcb6
  hezhen authored Jun 26, 2019
  
  fd24fcb6
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 0242fffe
  libin authored Jun 26, 2019
```
# Conflicts:
#	xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/AppApplication.java
```
  0242fffe
- 组件工程 · b09f8e69
  libin authored Jun 26, 2019
  
  b09f8e69
- banner调整 · b45957b3
  libin authored Jun 26, 2019
  
  b45957b3
- 修改首页列表 · dbb8d298
  hezhen authored Jun 26, 2019
  
  dbb8d298
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 960d53ae
  hanfeng authored Jun 26, 2019
  
  960d53ae