Merge remote-tracking branch 'origin/master'

Pu Zhibing

6 天以前 7d46f01159d0a902f94eba48f17e68184412eb44

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/OrderCrossCity.java

@@ -385,6 +385,15 @@

    private String splitAllocation;

    private Integer responsibilityType;

    public Integer getResponsibilityType() {
        return responsibilityType;
    }

    public void setResponsibilityType(Integer responsibilityType) {
        this.responsibilityType = responsibilityType;
    }
    public Integer getPromotion() {
        return promotion;
    }