Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

zjj

2024-06-18 da6ffd9b8d9687f8fb876e194da597c02f25f588

 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);

}