Merge remote-tracking branch 'origin/master'

mitao

2024-05-29 72401cca1d42db78aa25fc10758195b52dfcef96

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

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.auction.domain.AuctionSalesroom;
import org.apache.ibatis.annotations.Param;