From 375041c3d6d2ecb2228dcaa3cbefa079da40a8dd Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 24 八月 2023 15:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java
index 94b2849..2b2b23b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.starter.revision.model.BaseModel;
import java.util.List;
@@ -10,7 +10,7 @@
* @author lihang
* @date 2022-03-07
*/
-public class DockingSystemConfigVO extends BaseModelVO {
+public class DockingSystemConfigVO extends BaseModel {
/**
* 绂佹淇敼杩欎釜鍊�
@@ -237,15 +237,18 @@
* 鍒嗙被鍚嶇О
*/
private String classifyName;
-
+ /***
+ * 闆嗗洟鐮佹槸鍚﹀弬涓庣敵璇�/鏇存柊/鍙戦��
+ */
+ private String isGroupCodeFlag;
/***
* 鍙傛暟淇℃伅瀵硅薄
*/
- private List<SysIntParamVO> sysIntParamVOs;
+ private List<DockingSysIntParamVO> sysIntParamVOs;
/***
* header淇℃伅瀵硅薄
*/
- private List<SysIntHeaderVO> sysIntHeaderVOs;
+ private List<DockingSysIntHeaderVO> sysIntHeaderVOs;
public String getAuthorityOid() {
@@ -602,25 +605,33 @@
this.classifyName = classifyName;
}
- public List<SysIntParamVO> getSysIntParamVOs() {
+ public List<DockingSysIntParamVO> getSysIntParamVOs() {
return sysIntParamVOs;
}
- public void setSysIntParamVOs(List<SysIntParamVO> sysIntParamVOs) {
+ public void setSysIntParamVOs(List<DockingSysIntParamVO> sysIntParamVOs) {
this.sysIntParamVOs = sysIntParamVOs;
}
- public List<SysIntHeaderVO> getSysIntHeaderVOs() {
+ public List<DockingSysIntHeaderVO> getSysIntHeaderVOs() {
return sysIntHeaderVOs;
}
- public void setSysIntHeaderVOs(List<SysIntHeaderVO> sysIntHeaderVOs) {
+ public void setSysIntHeaderVOs(List<DockingSysIntHeaderVO> sysIntHeaderVOs) {
this.sysIntHeaderVOs = sysIntHeaderVOs;
+ }
+
+ public String getIsGroupCodeFlag() {
+ return isGroupCodeFlag;
+ }
+
+ public void setIsGroupCodeFlag(String isGroupCodeFlag) {
+ this.isGroupCodeFlag = isGroupCodeFlag;
}
@Override
public String toString() {
- return "SysIntInfoVO{" +
+ return "DockingSystemConfigVO{" +
"authorityOid='" + authorityOid + '\'' +
", authorityOidName='" + authorityOidName + '\'' +
", authorityType='" + authorityType + '\'' +
@@ -665,6 +676,7 @@
", pushTypeText='" + pushTypeText + '\'' +
", classifyId='" + classifyId + '\'' +
", classifyName='" + classifyName + '\'' +
+ ", isGroupCodeFlag=" + isGroupCodeFlag +
", sysIntParamVOs=" + sysIntParamVOs +
", sysIntHeaderVOs=" + sysIntHeaderVOs +
'}';
--
Gitblit v1.9.3