From a53ab71161c5a546c70fa22ec5530cc4b2c7a672 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 03 十二月 2024 17:12:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java | 146 +++++++++++++++++-------------------------------
1 files changed, 52 insertions(+), 94 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java
index 1d350ad..54713a2 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java
@@ -22,44 +22,44 @@
/**
* 涓婚敭锛屽鏋滆嚜宸辩殑瀵硅薄锛屼笉鏄痮id浣滀负涓婚敭鐨勮瘽锛岄渶瑕佺敤id杩欎釜娉ㄨВ
*/
- @Column(nullable = false,length = 50)
+ @Column(nullable = false)
private String oid;
/**
* 浠ｅ彿锛涘彲浠ヨ缃睘鎬х殑鏄犲皠锛宯ame琛ㄧず鍦ㄥ钩鍙扮殑涓氬姟绫诲瀷涓殑灞炴�у悕绉帮紝蹇呴』涓哄皬鍐欙紱
*/
- @Column(length = 50)
+ @Column()
private String id;
/**
* 鍚嶇О锛涗篃鍙互涓嶈缃睘鎬ф槧灏勶紝榛樿鏄瓧娈靛悕鐨勫皬鍐�
*/
- @Column(length = 50)
+ @Column()
private String name;
/**
* 鎻忚堪
*/
- @Column(length = 250)
+ @Column()
private String description;
/**
* 鐗堟湰鐨勪富閿�
*/
- @Column(length = 50)
+ @Column()
private String revisionOid;
/**
* 瀵硅薄鐨勪富閿�
*/
- @Column(length = 50)
+ @Column()
private String nameOid;
/**
* 涓氬姟绫诲瀷鐨勫悕绉�
*/
- @Column(length = 30)
- private String btmname;
+ @Column()
+ private String btmName;
/**
* 鏄惁鏈�鍚庣増鏈�
@@ -91,7 +91,7 @@
/**
* 鍒涘缓浜�
*/
- @Column(length = 50,nullable = false)
+ @Column(nullable = false)
private String creator;
/**
@@ -104,7 +104,7 @@
/**
* 鏈�鍚庝慨鏀逛汉
*/
- @Column(length = 50,nullable = false)
+ @Column(nullable = false)
private String lastModifier;
/**
@@ -116,7 +116,7 @@
/**
* 鐗堟湰瑙勫垯
*/
- @Column(length = 50)
+ @Column()
private String revisionRule;
@@ -129,14 +129,14 @@
/**
* 鐗堟湰鍊�
*/
- @Column(length = 50)
+ @Column()
private String revisionValue;
/**
* 鐗堟瑙勫垯
*/
- @Column(length = 50)
+ @Column()
private String versionRule;
/**
@@ -148,19 +148,19 @@
/**
* 鐗堟鍊�
*/
- @Column(length = 50)
+ @Column()
private String versionValue;
/**
* 鐢熷懡鍛ㄦ湡鐨勭紪鍙�
*/
@Transient()
- private String lctid;
+ private String lctId;
/**
* 鐢熷懡鍛ㄦ湡鍊�
*/
- @Column(length = 50)
+ @Column()
private String lcStatus;
/**
@@ -277,14 +277,13 @@
this.nameOid = nameOid;
}
- public String getBtmname() {
- return btmname;
+ public String getBtmName() {
+ return btmName;
}
- public void setBtmname(String btmname) {
- this.btmname = btmname;
+ public void setBtmName(String btmName) {
+ this.btmName = btmName;
}
-
public String getLastR() {
return lastR;
@@ -326,6 +325,14 @@
this.creator = creator;
}
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
public String getLastModifier() {
return lastModifier;
}
@@ -350,14 +357,6 @@
this.revisionRule = revisionRule;
}
- public String getVersionRule() {
- return versionRule;
- }
-
- public void setVersionRule(String versionRule) {
- this.versionRule = versionRule;
- }
-
public int getRevisionSeq() {
return revisionSeq;
}
@@ -372,6 +371,14 @@
public void setRevisionValue(String revisionValue) {
this.revisionValue = revisionValue;
+ }
+
+ public String getVersionRule() {
+ return versionRule;
+ }
+
+ public void setVersionRule(String versionRule) {
+ this.versionRule = versionRule;
}
public int getVersionSeq() {
@@ -390,12 +397,28 @@
this.versionValue = versionValue;
}
+ public String getLctId() {
+ return lctId;
+ }
+
+ public void setLctId(String lctId) {
+ this.lctId = lctId;
+ }
+
public String getLcStatus() {
return lcStatus;
}
public void setLcStatus(String lcStatus) {
this.lcStatus = lcStatus;
+ }
+
+ public String getLcStatusText() {
+ return lcStatusText;
+ }
+
+ public void setLcStatusText(String lcStatusText) {
+ this.lcStatusText = lcStatusText;
}
public Date getTs() {
@@ -454,22 +477,6 @@
this.copyFromVersion = copyFromVersion;
}
- public String getLcStatusText() {
- return lcStatusText;
- }
-
- public void setLcStatusText(String lcStatusText) {
- this.lcStatusText = lcStatusText;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
public Integer getSecretGrade() {
return secretGrade;
}
@@ -486,60 +493,11 @@
this.secretGradeText = secretGradeText;
}
- public String getLctid() {
- return lctid;
- }
-
- public void setLctid(String lctid) {
- this.lctid = lctid;
- }
-
-
public Map<String, String> getData() {
return data;
}
public void setData(Map<String, String> data) {
this.data = data;
- }
-
- @Override
- public String toString() {
- return "BaseModel{" +
- "oid='" + oid + '\'' +
- ", id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", description='" + description + '\'' +
- ", revisionOid='" + revisionOid + '\'' +
- ", nameOid='" + nameOid + '\'' +
- ", btmname='" + btmname + '\'' +
- ", lastR='" + lastR + '\'' +
- ", firstR='" + firstR + '\'' +
- ", lastV='" + lastV + '\'' +
- ", firstV='" + firstV + '\'' +
- ", creator='" + creator + '\'' +
- ", createTime=" + createTime +
- ", lastModifier='" + lastModifier + '\'' +
- ", lastModifyTime=" + lastModifyTime +
- ", revisionRule='" + revisionRule + '\'' +
- ", revisionSeq=" + revisionSeq +
- ", revisionValue='" + revisionValue + '\'' +
- ", versionRule='" + versionRule + '\'' +
- ", versionSeq=" + versionSeq +
- ", versionValue='" + versionValue + '\'' +
- ", lctid='" + lctid + '\'' +
- ", lcStatus='" + lcStatus + '\'' +
- ", lcStatusText='" + lcStatusText + '\'' +
- ", ts=" + ts +
- ", owner='" + owner + '\'' +
- ", checkInBy='" + checkInBy + '\'' +
- ", checkInTime=" + checkInTime +
- ", checkOutBy='" + checkOutBy + '\'' +
- ", checkOutTime=" + checkOutTime +
- ", copyFromVersion='" + copyFromVersion + '\'' +
- ", secretGrade=" + secretGrade +
- ", secretGradeText='" + secretGradeText + '\'' +
- ", data=" + data +
- '}';
}
}
--
Gitblit v1.9.3