From b1a281bc282070f78ca5dff42fc74188bfc9e9c7 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期二, 10 二月 2026 10:55:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
index 00ab9b3..0586e31 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
@@ -115,8 +115,7 @@
public R pageInFull(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
- QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true);
- // 娣诲姞type涓�'in'鐨勬潯浠讹紝娉ㄦ剰杩欓噷搴旇鎸囧畾琛ㄥ埆鍚�
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true, null, "create_time", "mi");
wrapper.eq("mo.type", OrderType.ORDER_IN.type);
IPage<InOrderAndItem> page = asnOrderItemMapper.queryFullOrderWithPaging(pageParam, wrapper);
--
Gitblit v1.9.1