Merge remote-tracking branch 'origin/master'

puzhibing

2023-03-22 ecf282fb285fbba74ff129a4be8a129aa0d8ceb1

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

@@ -129,6 +129,11 @@
     */
    private Date createTime;

    /**
     * 行程录音
     */
    private String routeRecord;

    @ApiModelProperty(value = "起步里程（公里）")
    private Double startDistance;

@@ -180,6 +185,14 @@
    @ApiModelProperty(value = "折扣优惠金额")
    private BigDecimal discountAmount;

    public String getRouteRecord() {
        return routeRecord;
    }

    public void setRouteRecord(String routeRecord) {
        this.routeRecord = routeRecord;
    }

    public BigDecimal getDiscountAmount() {
        return discountAmount;
    }