From 3caa0b05a620aa7714de0d63c804e43aa6486c9b Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 11 Jul 2025 18:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java | 1 -
1 files changed, 0 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..7d443e4 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
@@ -34,7 +34,6 @@
@ApiModelProperty(value = "名称")
private String merchantName;
- @NotBlank
@ApiModelProperty(value = "商户编码")
private String merchantCode;
--
Gitblit v1.9.3