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

luodangjia

2024-07-22 f9fff682ff6b21344401bb86f85d25c97c37b073

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

@@ -51,11 +51,12 @@
    /**
     * 是否勾选了专车 0否1是
     */
    private Integer isPrivateCar;
//    private Integer isPrivateCar;
    /**
     * 是否勾选了包裹 0否1是
     */
    private Integer isPackage;
//    private Integer isPackage;

    /**
     * 添加时间
     */