From 46f7c2ef3abc235e44c59be9b3c5396befc64888 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 18:33:09 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 3c6a316..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,10 +31,13 @@
private Long merchantId;
@NotBlank
+ @ApiModelProperty(value = "商户类型")
+ private String merchantType;
+
+ @NotBlank
@ApiModelProperty(value = "名称")
private String merchantName;
- @NotBlank
@ApiModelProperty(value = "商户编码")
private String merchantCode;
--
Gitblit v1.9.3