• jiaorz's avatar
    Merge branch 'master-change-arrival-company' into dev · ade38432
    jiaorz authored
    # Conflicts:
    #	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java
    #	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
    #	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
    ade38432
Name
Last commit
Last update
..
xx-universal-api Loading commit data...
xx-universal-server Loading commit data...
pom.xml Loading commit data...