Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-06 3e95b11cff2e6f59a7d23448f86d3d3bf806e13a

 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 model.OrderGood;
import org.springframework.stereotype.Service;

/**