xx-tour/xx-tour-server · fb07a5c0a72d4a0bbc19d159435ac4709f458e0e · youjj / cloud-platform

Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · fb07a5c0

youjj authored Jun 10, 2019

# Conflicts:
#	xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/common/TourBaseController.java
#	xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodSpeController.java

fb07a5c0

Name	Last commit	Last update
..
src/main		Loading commit data...
pom.xml		Loading commit data...