From bfd33f437b2165c1e36d5439a0866a557a6dc42e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 22 五月 2024 10:02:14 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 15 +++++++++++++--
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java | 3 ++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 2c5db54..6ec68f8 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -1,8 +1,19 @@
package com.ruoyi.order.controller;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.order.service.IOrderService;
+import com.ruoyi.system.api.domain.dto.OrderDTO;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -16,7 +27,7 @@
@Slf4j
@RestController
@RequestMapping("/order")
-@AllArgsConstructor
+@RequiredArgsConstructor
public class OrderController {
private final IOrderService orderService;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java
index 5ad8367..0e25900 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java
@@ -1,7 +1,8 @@
package com.ruoyi.order.service;
-import com.ruoyi.order.domain.pojo.Order;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.domain.pojo.Order;
+import com.ruoyi.system.api.domain.dto.OrderDTO;
/**
* <p>
--
Gitblit v1.7.1