From 34640adf8a1d16f4202edcad644081b28bf61f1d Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 26 六月 2024 17:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmUserDO.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/SmUserDO.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmUserDO.java
similarity index 91%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/SmUserDO.java
rename to Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmUserDO.java
index 4b05d52..9eb31ee 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/model/SmUserDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/model/SmUserDO.java
@@ -1,4 +1,4 @@
-package com.vci.web.model;
+package com.vci.frameworkcore.model;
import com.vci.starter.web.annotation.*;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
@@ -100,6 +100,7 @@
name = "plcreateuser"
)
private String creator;
+
/**
* 鍒涘缓鏃堕棿
*/
@@ -119,6 +120,7 @@
name = "plupdateuser"
)
private String lastModifier;
+
/**
* 鏈�鍚庝慨鏀规椂闂�
*/
@@ -127,6 +129,14 @@
name = "plupdatetime"
)
private Date lastModifyTime;
+
+ /**
+ * 瀵嗙爜鏈�鍚庝慨鏀规椂闂�
+ */
+ @Column(
+ name = "plpwdupdatetime"
+ )
+ public Date pwdUpdateTime;
/**
* 鎵�灞為儴闂�
@@ -151,6 +161,22 @@
*/
@Transient(referColumn = "pkUserPassword.plpasswordstrategyuid")
private String pkPasswordStrategy;
+
+ /**
+ * 涓撲笟
+ */
+ @Column(
+ name = "plspecialties"
+ )
+ private String specialties;
+
+ public void setSpecialties(String specialties) {
+ this.specialties = specialties;
+ }
+
+ public String getSpecialties() {
+ return specialties;
+ }
public String getOid() {
return oid;
@@ -304,6 +330,14 @@
this.pkPasswordStrategy = pkPasswordStrategy;
}
+ public void setPwdUpdateTime(Date pwdUpdateTime) {
+ this.pwdUpdateTime = pwdUpdateTime;
+ }
+
+ public Date getPwdUpdateTime() {
+ return pwdUpdateTime;
+ }
+
@Override
public String toString() {
return "SmUserDO{" +
@@ -328,4 +362,5 @@
", pkPasswordStrategy='" + pkPasswordStrategy + '\'' +
'}';
}
+
}
--
Gitblit v1.9.3