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

zhibing.pu

2024-06-21 a5c2c7e633e0dba4b80c8a15fd34c38ae097befc

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

@@ -292,6 +292,8 @@
    private BigDecimal abnormalMoney;

    private Integer isFrozen;
    
    private String tripId;

    public Integer getIsFrozen() {
        return isFrozen;
@@ -836,7 +838,23 @@
    public void setServerCarModelId(Integer serverCarModelId) {
        this.serverCarModelId = serverCarModelId;
    }

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