From 70fb56a9fb61f70ccc55fcbc085b470e9423858a Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 05 六月 2023 16:16:35 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
index 6384c7c..e06ea23 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
@@ -26,8 +26,6 @@
private String id;
private String name;
- //闆嗗洟鐮�
- private String groupcode;
private String description;
@@ -342,13 +340,13 @@
this.lctid = lctid;
}
- public String getGroupcode() {
+/* public String getGroupcode() {
return this.groupcode;
}
public void setGroupcode(String groupcode) {
this.groupcode = groupcode;
- }
+ }*/
public Map<String, String> getData() {
return this.data;
--
Gitblit v1.9.3