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

无关风月

2025-09-04 f4c8c73bc5181b6d3265c6a0ce19ae13c600baa3

 ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java

@@ -60,6 +60,7 @@
     * @return
     */
    Map<String,Object> getPrivateCarOrderDetailById(@Param("orderId") Integer orderId);
    Map<String,Object> getPrivateCarOrderDetailByOrderNumber(@Param("orderNumber") String orderNumber);

    List<Map<String,Object>> getPrivateCarOrderListNoPage(
                                                    @Param("beginTime") String beginTime,