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

xuhy

2024-02-01 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d

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

@@ -29,7 +29,7 @@
     */
    private Integer carId;
    /**
     * 类型(1=专车，2=出租车，3=城际(跨城出行)，4=小件物流-同城，5=小件物流-跨城，6=包车)
     * 类型(1=专车，4=市内小件物流)
     */
    private Integer type;
    /**