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

xuhy

2024-02-01 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java

@@ -16,7 +16,7 @@
     * @param orderId
     * @return
     */
    Map<String, Object> queryPushOrder(@Param("orderId") Integer orderId);
    Map<String, Object> queryPushOrder(@Param("orderId") Integer orderId, @Param("language") Integer language);



@@ -33,7 +33,8 @@
     * @param driverId
     * @return
     */
    List<Map<String, Object>> queryOrderList(@Param("driverId") Integer driverId);
    List<Map<String, Object>> queryOrderList(@Param("driverId") Integer driverId,
                                             @Param("language") Integer language);


    /**
@@ -42,7 +43,8 @@
     * @param uid
     * @return
     */
    List<Map<String, Object>> queryMyAllOrder(@Param("state") Integer state, @Param("uid") Integer uid);
    List<Map<String, Object>> queryMyAllOrder(@Param("state") Integer state, @Param("uid") Integer uid,
                                              @Param("language") Integer language);


    /**