From 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 07 Aug 2025 15:57:07 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java b/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java
index 7d443e4..a527753 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java
@@ -31,6 +31,10 @@
private Long merchantId;
@NotBlank
+ @ApiModelProperty(value = "商户类型")
+ private String merchantType;
+
+ @NotBlank
@ApiModelProperty(value = "名称")
private String merchantName;
--
Gitblit v1.9.3