From d93356927d8a0a5a91963c28d461d9107562d759 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 30 May 2025 17:38:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin'

---
 oying-system/src/main/java/com/oying/modules/system/domain/dto/MerchantsQueryCriteria.java |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 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
new file mode 100644
index 0000000..f56c7a0
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/dto/MerchantsQueryCriteria.java
@@ -0,0 +1,36 @@
+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
+**/
+@Data
+public class MerchantsQueryCriteria{
+
+    @ApiModelProperty(value = "页码", example = "1")
+    private Integer page = 1;
+
+    @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 enabled;
+    private List<Timestamp> createTime;
+}

--
Gitblit v1.9.3