Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2023-07-19 6cc28b0853183a0ede9f1e3addd7603095d98133

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java

@@ -163,20 +163,20 @@
    @TableField("overLongDistancePrice")
    private Double overLongDistancePrice;
    /**
     * 等待时长（分钟）
     * 等待时长（s）
     */
    @TableField("waitTime")
    private Double waitTime;
    private Integer waitTime;
    /**
     * 等待费
     */
    @TableField("waitTimePrice")
    private Double waitTimePrice;
    /**
     * 超出等待时长（分钟）
     * 超出等待时长（s）
     */
    @TableField("outWaitTime")
    private Double outWaitTime;
    private Integer outWaitTime;
    /**
     * 超出等待时长费
     */