From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb
---
oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 dc6525d..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;
@@ -54,7 +57,7 @@
private Integer merchantSort;
@ApiModelProperty(value = "状态")
- private String enabled = "1";
+ private String enabled = "0";
@ApiModelProperty(value = "审核人")
private String auditUser;
@@ -67,7 +70,7 @@
@TableField(exist = false)
@ApiModelProperty(value = "用户ID")
- private String userId;
+ private Long userId;
public void copy(Merchant source) {
BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
--
Gitblit v1.9.3