Merge remote-tracking branch 'origin/master'

mitao

2024-05-29 b19813f4f558c350b2c6e8fcb821080b0c10b257

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.auction.domain.AuctionGoods;
import com.ruoyi.system.api.domain.AuctionGoods;

/**
 * <p>