Merge remote-tracking branch 'origin/master'

mitao

2024-05-29 72401cca1d42db78aa25fc10758195b52dfcef96

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

@@ -1,7 +1,7 @@
package com.ruoyi.auction.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.auction.controller.forepart.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import org.apache.ibatis.annotations.Param;