From 6f2a4980f4ca7a794b103cfde9946a905c5ba399 Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期五, 26 一月 2024 16:21:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/controller/OrderTestController.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/OrderTestController.java
similarity index 78%
rename from north-glass-erp/src/main/java/com/example/erp/controller/OrderController.java
rename to north-glass-erp/src/main/java/com/example/erp/controller/OrderTestController.java
index e61f42d..4c5a198 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/OrderTestController.java
@@ -1,19 +1,16 @@
package com.example.erp.controller;
-import com.example.erp.common.Result;
-import com.example.erp.mapper.OrderMapper;
-import com.example.erp.entity.Order;
+import com.example.erp.mapper.OrderTestMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
//@CrossOrigin //瑙ｅ喅鍗曚釜controller 璺ㄥ煙闂
@RestController
-@RequestMapping("/order")
+@RequestMapping("/order11111111")
-public class OrderController {
+public class OrderTestController {
@Autowired
- private OrderMapper orderMapper;
+ private OrderTestMapper orderMapper;
// @GetMapping //鏌ヨorder琛ㄧ粨鏋滈泦
// public Result index(){
--
Gitblit v1.8.0