Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-05 0a6f6770dd3aecfc076e9cd5b46a728dd2b9b440

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java

@@ -2,8 +2,8 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.mapper.OrderGoodMapper;
import com.ruoyi.order.model.OrderGood;
import com.ruoyi.order.service.OrderGoodService;
import com.ruoyi.model.OrderGood;
import org.springframework.stereotype.Service;

/**