Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-20 ed4f07531b9cb0794e976a14cee3b591dec8d4f6

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderAuctionMapper.java

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

import com.ruoyi.order.domain.pojo.OrderAuction;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.OrderAuction;

/**
 * <p>