From 8a780787a6b1db9f934bf730c17e0a6a4fc7f01b Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 17 Jun 2025 15:34:28 +0800
Subject: [PATCH] 用户
---
oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java | 19 +++++++++++++------
oying-system/src/main/java/com/oying/modules/system/domain/User.java | 4 ----
2 files changed, 13 insertions(+), 10 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..dc6525d 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")
@@ -62,7 +65,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 String userId;
+
+ public void copy(Merchant source) {
+ BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
}
}
diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/User.java b/oying-system/src/main/java/com/oying/modules/system/domain/User.java
index 486110e..d5fa6fc 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/User.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/User.java
@@ -9,7 +9,6 @@
import lombok.Setter;
import com.oying.base.BaseEntity;
-import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
@@ -54,12 +53,9 @@
@ApiModelProperty(value = "用户昵称")
private String nickName;
- @Email
- @NotBlank
@ApiModelProperty(value = "邮箱")
private String email;
- @NotBlank
@ApiModelProperty(value = "电话号码")
private String phone;
--
Gitblit v1.9.3