Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-06 3e95b11cff2e6f59a7d23448f86d3d3bf806e13a

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java

@@ -4,8 +4,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.order.model.OrderGood;
import com.ruoyi.order.service.OrderGoodService;
import com.ruoyi.model.OrderGood;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;