Merge remote-tracking branch 'origin/master'

puzhibing

2023-03-11 b088628cf9be70c36e34032bb0d024548351541b

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java

@@ -177,6 +177,17 @@
    @ApiModelProperty(value = "恶劣天气超出费")
    private BigDecimal overBadWeatherPrice;

    @ApiModelProperty(value = "折扣优惠金额")
    private BigDecimal discountAmount;

    public BigDecimal getDiscountAmount() {
        return discountAmount;
    }

    public void setDiscountAmount(BigDecimal discountAmount) {
        this.discountAmount = discountAmount;
    }

    public Double getStartDistance() {
        return startDistance;
    }