From 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 08 九月 2025 13:41:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
index 0bae393..89e1722 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
@@ -53,6 +53,8 @@
 
     @ApiModelProperty(value = "涔板鏄电О")
     private String buyerName;
+    @ApiModelProperty(value = "鐢ㄦ埛鏄电О")
+    private String nickName;
 
     @ApiModelProperty(value = "璁㈠崟鐘舵��")
     private String orderStatus;
@@ -172,6 +174,9 @@
         //璁㈠崟鏉ユ簮
         wrapper.like(CharSequenceUtil.isNotEmpty(clientType), "o.client_type", clientType);
 
+        //鐢ㄦ埛鏄电О
+        wrapper.like(CharSequenceUtil.isNotEmpty(nickName),"m.nick_name",nickName);
+
         //鎸夎瘎浠风姸鎬�
         wrapper.eq(CharSequenceUtil.isNotEmpty(commentStatus), "oi.comment_status", commentStatus);
 

--
Gitblit v1.8.0