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

Junjie

2024-05-31 93b17a7e74d8e16ac6fa30e90e9db3960736d57f

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java

@@ -12,4 +12,6 @@

    void updateOrder1(Long orderId,@Param("userId")Long userId);

    int updateSettle(@Param("orderId") Long orderId, @Param("settle") Long settle, @Param("userId") Long userId, @Param("hostId") Long hostId);

}