• youjj's avatar
    Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 711e66e6
    youjj authored
    # Conflicts:
    #	xx-tour/xx-tour-api/pom.xml
    #	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
    #	xx-tour/xx-tour-server/src/main/resources/bootstrap.yml
    #	xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml
    #	xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodSpePriceMapper.xml
    711e66e6
Name
Last commit
Last update
..
xx-tour-api Loading commit data...
xx-tour-server Loading commit data...
pom.xml Loading commit data...