From 4114759a57d73661937f28a765fb8a67c017b14b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 24 六月 2025 16:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index 1168c07..24fc8af 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -61,8 +61,8 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);
QueryWrapper<AsnOrder> queryWrapper = pageParam.buildWrapper(true);
-// List<String> asList = Arrays.asList(OrderType.ORDER_OUT.type);
-// queryWrapper.notIn("type", asList);
+ List<String> asList = Arrays.asList(OrderType.ORDER_IN.type);
+ queryWrapper.in("type", asList);
return R.ok().add(asnOrderService.page(pageParam, queryWrapper));
}
--
Gitblit v1.9.1