From f30342f8762f598da78ee9be80779085347af067 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 10 Jul 2025 15:51:32 +0800
Subject: [PATCH] 订单商品

---
 oying-system/src/main/java/com/oying/modules/system/domain/dto/MerchantsQueryCriteria.java |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/dto/MerchantsQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/system/domain/dto/MerchantsQueryCriteria.java
index f56c7a0..2d6f04b 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/dto/MerchantsQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/dto/MerchantsQueryCriteria.java
@@ -1,16 +1,18 @@
 package com.oying.modules.system.domain.dto;
 
 import lombok.Data;
+
 import java.sql.Timestamp;
 import java.util.List;
+
 import io.swagger.annotations.ApiModelProperty;
 
 /**
-* @author lixin
-* @date 2025-05-29
-**/
+ * @author lixin
+ * @date 2025-05-29
+ **/
 @Data
-public class MerchantsQueryCriteria{
+public class MerchantsQueryCriteria {
 
     @ApiModelProperty(value = "页码", example = "1")
     private Integer page = 1;
@@ -18,17 +20,8 @@
     @ApiModelProperty(value = "每页数据量", example = "10")
     private Integer size = 10;
 
-    @ApiModelProperty(value = "名称")
-    private String merchantName;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "营业执照号")
-    private String businessLicense;
-
-    @ApiModelProperty(value = "联系手机")
-    private String contactMobile;
+    @ApiModelProperty(value = "模糊查询(名称、商户编码、营业执照号、联系手机)")
+    private String blurry;
 
     @ApiModelProperty(value = "状态")
     private String enabled;

--
Gitblit v1.9.3