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

puzhibing

2024-05-06 7c26ec693561ecce9fba31ab4e83e9f30d641aad

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java

@@ -187,11 +187,6 @@
    @TableField("orderMoney")
    private Double orderMoney;
    /**
     * 起步里程
     */
    @TableField("startMileage")
    private Double startMileage;
    /**
     * 起步价
     */
    @TableField("startMoney")
@@ -409,30 +404,20 @@
    @TableField("destination")
    private String destination;
    private Integer isplatPay;
    /**
     * 是否首单免费1否，2是
     * @return
     */
    @TableField("isFree")
    private Integer isFree;
    private BigDecimal freeMoney;
    /**
     * 补差价金额
     */
    @TableField("priceDifference")
    private Double priceDifference;
    private Integer startDuration;
    /**
     * 收费方式(1=普通，2=夜间，3=高峰)
     * 起步里程
     */
    private Integer moneyType;
    @TableField("startMileage")
    private Double startMileage;
    /**
     * 收费方式时间段
     * 中途取消（0=否，1=是）
     */
    private String moneyTime;
    
    private Date smsTime;
    
    private Integer smsNumber;
    
    @TableField("cancelMidway")
    private Integer cancelMidway;
}