zhibing.pu
2024-05-13 7ea05c419cb4cdf92f2c1a747ff0570aca226d20
Merge remote-tracking branch 'origin/2.0' into 2.0
2个文件已修改
3 ■■■■ 已修改文件
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderTimeInfo.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;