From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/system/domain/dto/MerchantsQueryCriteria.java | 3 +++
1 files changed, 3 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
index 2d6f04b..294e728 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
@@ -24,6 +24,9 @@
private String blurry;
@ApiModelProperty(value = "状态")
+ private String merchantType;
+
+ @ApiModelProperty(value = "状态")
private String enabled;
private List<Timestamp> createTime;
}
--
Gitblit v1.9.3