Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-01 92480c7fd17a6bf89205ffcf4b78eef17988f0d5

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

@@ -385,6 +385,25 @@

    private String splitAllocation;

    private Integer responsibilityType;

    private Long promotionActivityId;

    public Long getPromotionActivityId() {
        return promotionActivityId;
    }

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

    public Integer getResponsibilityType() {
        return responsibilityType;
    }

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