From bf34781f045a9913f14a2548e10d1d7c349ed197 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 20 十月 2023 12:10:53 +0800
Subject: [PATCH] fix 修复 commons-io 依赖冲突
---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
index 09842a9..71e4991 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
@@ -1,15 +1,11 @@
package org.dromara.common.core.domain.model;
import jakarta.validation.constraints.Email;
-import org.dromara.common.core.constant.UserConstants;
-import lombok.Data;
-import org.dromara.common.core.validate.auth.EmailGroup;
-import org.dromara.common.core.validate.auth.PasswordGroup;
-import org.dromara.common.core.validate.auth.SmsGroup;
-import org.dromara.common.core.validate.auth.WechatGroup;
-import org.hibernate.validator.constraints.Length;
-
import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.dromara.common.core.constant.UserConstants;
+import org.dromara.common.core.validate.auth.*;
+import org.hibernate.validator.constraints.Length;
/**
* 鐢ㄦ埛鐧诲綍瀵硅薄
@@ -45,7 +41,6 @@
/**
* 绉熸埛ID
*/
- @NotBlank(message = "{tenant.number.not.blank}")
private String tenantId;
/**
@@ -103,4 +98,21 @@
@NotBlank(message = "{xcx.code.not.blank}", groups = {WechatGroup.class})
private String xcxCode;
+ /**
+ * 绗笁鏂圭櫥褰曞钩鍙�
+ */
+ @NotBlank(message = "{social.source.not.blank}" , groups = {SocialGroup.class})
+ private String source;
+
+ /**
+ * 绗笁鏂圭櫥褰昪ode
+ */
+ @NotBlank(message = "{social.code.not.blank}" , groups = {SocialGroup.class})
+ private String socialCode;
+
+ /**
+ * 绗笁鏂圭櫥褰晄ocialState
+ */
+ @NotBlank(message = "{social.state.not.blank}" , groups = {SocialGroup.class})
+ private String socialState;
}
--
Gitblit v1.9.3