Merge remote-tracking branch 'origin/master'

mitao

2024-06-19 d4f159d60acf6f263bfa4508a113c0feacd2f5b9

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionServiceImpl.java

@@ -1,9 +1,9 @@
package com.ruoyi.order.service.impl;

import com.ruoyi.order.domain.pojo.OrderAuction;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.domain.OrderAuction;
import com.ruoyi.order.mapper.OrderAuctionMapper;
import com.ruoyi.order.service.IOrderAuctionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**