From cca719d0cb879a650c743ada280de846a8dfeb6f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 18 六月 2024 16:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java
index dc5249f..79655e4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java
@@ -360,8 +360,7 @@
@Override
public String toString() {
return "SmUserVO{" +
- "oid='" + getOid() + '\'' +
- ",id='" + id + '\'' +
+ "id='" + id + '\'' +
", name='" + name + '\'' +
", userType='" + userType + '\'' +
", userTypeText='" + userTypeText + '\'' +
@@ -385,9 +384,8 @@
", sexText='" + sexText + '\'' +
", langCode='" + langCode + '\'' +
", langCodeText='" + langCodeText + '\'' +
- ", lockFlag='" + lockFlag + '\'' +
+ ", lockFlag=" + lockFlag +
", photo='" + photo + '\'' +
- ",description='" + getDescription() + '\'' +
'}';
}
}
--
Gitblit v1.9.3