From ea3151e1e9378a8454d3119908b47aa72f8869e6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 28 二月 2024 16:33:46 +0800
Subject: [PATCH] Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs

---
 src/main/java/com/zy/asrs/controller/OrderController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index f47db1a..863f61e 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -344,10 +344,11 @@
     }
 
     @RequestMapping(value = "/orderQuery/auth")
-    @ManagerAuth
+//    @ManagerAuth
     public R query(String condition) {
         EntityWrapper<Order> wrapper = new EntityWrapper<>();
         wrapper.like("order_no", condition);
+        wrapper.le("settle",3);
         Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
         for (Order order : page.getRecords()){

--
Gitblit v1.9.1