Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/model/OrderCharteredCar.java

@@ -50,6 +50,9 @@
     */
    @TableField("serverCarModelId")
    private Integer serverCarModelId;

    @TableField("serviceId")
    private Integer serviceId;
    /**
     * 车型用途
     */
@@ -80,6 +83,8 @@
     */
    @TableField("remark")
    private String remark;
    @TableField("newRemark")
    private String newRemark;

    @TableField("startLon")
    private Double startLon;
@@ -160,7 +165,7 @@
    }


    public void setCarTime(Integer carTime) {
    public void setCarTime(double carTime) {
        this.carTime = carTime;
    }