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

luodangjia

2024-07-17 736ab0090700c75af37b8a3456b01609e4e2d329

 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;
    /**
     * 补差价金额
@@ -420,4 +421,9 @@
     */
    @TableField("cancelMidway")
    private Integer cancelMidway;
    /**
     * google行程id
     */
    @TableField("tripId")
    private String tripId;
}