Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-05 03331f46c05015df9debef834e752b2f9d13f9e0

 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;