From 2719424e8639a508f716dca2aaa05c340778dff1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 七月 2023 17:12:06 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java
index 815febf..3ea96dc 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java
@@ -1,13 +1,24 @@
package com.vci.ubcs.code.vo.pagemodel;
+import lombok.Data;
+
import java.util.ArrayList;
import java.util.List;
+/****
+ * 鎵归噺鐢宠redis缂撳瓨瀵硅薄
+ * @author xiejun
+ * @date 2023-06-14
+ */
+@Data
public class CodeImportTemplateVO {
- private List<ColumnVO> cloNamesList=new ArrayList<>();
-
- private CodeClassifyTemplateVO codeClstemplateVO;
-
- private CodeClassifyVO codeClassifyVO;
+ private boolean root;
+ private String codeClassifyOid;
+ private String codeTemplateOid;
+ private String codeRuleOid;
+ private List<ColumnVO> cloNamesList=new ArrayList<>();
+ private CodeRuleVO codeRuleVO;
+ private CodeClassifyTemplateVO codeClassifyTemplateVO;
+ private CodeClassifyVO codeClassifyVO;
}
--
Gitblit v1.9.3