Merge remote-tracking branch 'origin/master'

NNowhZzU

2024-01-26 6f2a4980f4ca7a794b103cfde9946a905c5ba399

 north-glass-erp/src/main/java/com/example/erp/controller/OrderTestController.java

File was renamed from north-glass-erp/src/main/java/com/example/erp/controller/OrderController.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(){