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

puzhibing

2024-05-09 23492ba390fd61d23a160b06595d72ce498a8340

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java

@@ -20,7 +20,7 @@
     * @throws Exception
     */
    List<OrderPrivateCar> queryByState(@Param("uid") Integer uid, @Param("orderType") Integer orderType,
                                       @Param("type") Integer type, @Param("state") Integer...state) throws Exception;
                                       @Param("type") Integer type, @Param("state") Integer...state) ;