From 3bcd305ef9408ae54f7ef62b8472d0813ae34333 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:53:44 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportTemplateVO.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 fb62869..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
@@ -12,11 +12,13 @@
*/
@Data
public class CodeImportTemplateVO {
- private List<ColumnVO> cloNamesList=new ArrayList<>();
-
- private CodeClassifyTemplateVO codeClassifyTemplateVO;
-
- 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