Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionSalesroomMapper.java

@@ -20,5 +20,5 @@
public interface AuctionSalesroomMapper extends BaseMapper<AuctionSalesroom> {
   List<AuctionSalesroom> pageMemberAuctionSalesroomList(Page page, @Param("param") MemberAuctionSalesroomDTO memberAuctionSalesroomDTO);

   List<AuctionSalesroom> pageMemberAuctionSalesroomWdList(Page page,@Param("param")  MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO);
   Page<AuctionSalesroom> pageMemberAuctionSalesroomWdList(@Param("page")  Page page,@Param("param")  MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO);
}