From 21243336236f8ac0575885eaedd43a6b8eeca31b Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 15:44:18 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 5660ada..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
@@ -1,12 +1,15 @@
package com.oying.modules.system.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.oying.base.BaseEntity;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
+
import java.sql.Timestamp;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -14,10 +17,10 @@
import lombok.Setter;
/**
-* @description /
-* @author lixin
-* @date 2025-05-29
-**/
+ * @author lixin
+ * @description /
+ * @date 2025-05-29
+ **/
@Getter
@Setter
@TableName("sys_merchant")
@@ -28,10 +31,13 @@
private Long merchantId;
@NotBlank
+ @ApiModelProperty(value = "商户类型")
+ private String merchantType;
+
+ @NotBlank
@ApiModelProperty(value = "名称")
private String merchantName;
- @NotBlank
@ApiModelProperty(value = "商户编码")
private String merchantCode;
@@ -51,7 +57,7 @@
private Integer merchantSort;
@ApiModelProperty(value = "状态")
- private String enabled = "1";
+ private String enabled = "0";
@ApiModelProperty(value = "审核人")
private String auditUser;
@@ -62,7 +68,11 @@
@ApiModelProperty(value = "审核信息")
private String auditMessage;
- public void copy(Merchant source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+ @TableField(exist = false)
+ @ApiModelProperty(value = "用户ID")
+ private Long userId;
+
+ public void copy(Merchant source) {
+ BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
}
}
--
Gitblit v1.9.3