合并代码

puzhibing

2024-05-09 cd16d710415a86e2012bdac8badafeda0bec0b61

合并代码

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

@@ -404,6 +404,7 @@
    @TableField("destination")
    private String destination;
    private Integer isplatPay;
    @TableField(exist = false)
    private BigDecimal freeMoney;
    /**
     * 补差价金额

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderTimeInfo.java

@@ -11,7 +11,7 @@
@Data
@ApiModel
public class OrderTimeInfo {
    @ApiModelProperty("截单时间")
    @ApiModelProperty("接单时间")
    private String snatchOrderTime;
    @ApiModelProperty("取件时间")
    private String startServiceTime;