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

xuhy

19 小时以前 3b6789ae8cb8138533b2cc362f37ad94b605a58d

 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,