• jiaorz's avatar
    Merge branch 'master-activity-bk' into dev · 0c06e9e7
    jiaorz authored
    # Conflicts:
    #	xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java
    #	xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/VehicleModelController.java
    0c06e9e7
Name
Last commit
Last update
..
xx-uccn-api Loading commit data...
xx-uccn-server Loading commit data...
pom.xml Loading commit data...