From f3c411d4ddc5d1ebf7414103b1bc0d09b929c413 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 20 四月 2023 10:37:58 +0800
Subject: [PATCH] 联调修改codebasic，以及代码合并
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java
index 0b5bfa3..fb756b9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java
@@ -35,10 +35,10 @@
private String lcStatusText;
private Date ts;
private String owner;
- private String checkInBy;
- private Date checkInTime;
- private String checkOutBy;
- private Date checkOutTime;
+// private String checkInBy;
+// private Date checkInTime;
+// private String checkOutBy;
+// private Date checkOutTime;
private String copyFromVersion;
private Integer secretGrade;
private String secretGradeText;
@@ -181,7 +181,7 @@
return this.revisionSeq;
}
- public void setRevisionSeq(int revisionSeq) {
+ public void setRevisionSeq(Integer revisionSeq) {
this.revisionSeq = revisionSeq;
}
@@ -197,7 +197,7 @@
return this.versionSeq;
}
- public void setVersionSeq(int versionSeq) {
+ public void setVersionSeq(Integer versionSeq) {
this.versionSeq = versionSeq;
}
@@ -233,7 +233,7 @@
this.owner = owner;
}
- public String getCheckInBy() {
+ /*public String getCheckInBy() {
return this.checkInBy;
}
@@ -263,7 +263,7 @@
public void setCheckOutTime(Date checkOutTime) {
this.checkOutTime = checkOutTime;
- }
+ }*/
public String getCopyFromVersion() {
return this.copyFromVersion;
@@ -323,6 +323,6 @@
@Override
public String toString() {
- return "BaseModelVO{oid='" + this.oid + '\'' + ", id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + ", revisionOid='" + this.revisionOid + '\'' + ", nameOid='" + this.nameOid + '\'' + ", btmname='" + this.btmname + '\'' + ", lastR='" + this.lastR + '\'' + ", firstR='" + this.firstR + '\'' + ", lastV='" + this.lastV + '\'' + ", firstV='" + this.firstV + '\'' + ", creator='" + this.creator + '\'' + ", createTime=" + this.createTime + ", lastModifier='" + this.lastModifier + '\'' + ", lastModifyTime=" + this.lastModifyTime + ", revisionRule='" + this.revisionRule + '\'' + ", revisionSeq=" + this.revisionSeq + ", revisionValue='" + this.revisionValue + '\'' + ", versionRule='" + this.versionRule + '\'' + ", versionSeq=" + this.versionSeq + ", versionValue='" + this.versionValue + '\'' + ", lcStatus='" + this.lcStatus + '\'' + ", lcStatusText='" + this.lcStatusText + '\'' + ", ts=" + this.ts + ", owner='" + this.owner + '\'' + ", checkInBy='" + this.checkInBy + '\'' + ", checkInTime=" + this.checkInTime + ", checkOutBy='" + this.checkOutBy + '\'' + ", checkOutTime=" + this.checkOutTime + ", copyFromVersion='" + this.copyFromVersion + '\'' + ", secretGrade=" + this.secretGrade + ", secretGradeText='" + this.secretGradeText + '\'' + ", lctid='" + this.lctid + '\'' + ", data=" + this.data + '}';
+ return "BaseModelVO{oid='" + this.oid + '\'' + ", id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + ", revisionOid='" + this.revisionOid + '\'' + ", nameOid='" + this.nameOid + '\'' + ", btmname='" + this.btmname + '\'' + ", lastR='" + this.lastR + '\'' + ", firstR='" + this.firstR + '\'' + ", lastV='" + this.lastV + '\'' + ", firstV='" + this.firstV + '\'' + ", creator='" + this.creator + '\'' + ", createTime=" + this.createTime + ", lastModifier='" + this.lastModifier + '\'' + ", lastModifyTime=" + this.lastModifyTime + ", revisionRule='" + this.revisionRule + '\'' + ", revisionSeq=" + this.revisionSeq + ", revisionValue='" + this.revisionValue + '\'' + ", versionRule='" + this.versionRule + '\'' + ", versionSeq=" + this.versionSeq + ", versionValue='" + this.versionValue + '\'' + ", lcStatus='" + this.lcStatus + '\'' + ", lcStatusText='" + this.lcStatusText + '\'' + ", ts=" + this.ts + ", owner='" + this.owner + '\'' + ", checkInBy='" + ", copyFromVersion='" + this.copyFromVersion + '\'' + ", secretGrade=" + this.secretGrade + ", secretGradeText='" + this.secretGradeText + '\'' + ", lctid='" + this.lctid + '\'' + ", data=" + this.data + '}';
}
}
--
Gitblit v1.9.3