Merge remote-tracking branch 'origin/master'

guyue

3 天以前 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9

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

@@ -387,6 +387,16 @@

    private Integer responsibilityType;

    private Long promotionActivityId;

    public Long getPromotionActivityId() {
        return promotionActivityId;
    }

    public void setPromotionActivityId(Long promotionActivityId) {
        this.promotionActivityId = promotionActivityId;
    }

    public Integer getResponsibilityType() {
        return responsibilityType;
    }