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

luodangjia

2024-07-17 736ab0090700c75af37b8a3456b01609e4e2d329

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java

@@ -255,6 +255,8 @@
     */
    private String bindId;

    private String tripId;

    public Integer getOldState() {
        return oldState;
    }
@@ -719,6 +721,14 @@
        this.bindId = bindId;
    }

    public String getTripId() {
        return tripId;
    }
    
    public void setTripId(String tripId) {
        this.tripId = tripId;
    }
    
    @Override
    protected Serializable pkVal() {
        return this.id;