From cfededd9721be4322e660fc879f11a806fcc7963 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期二, 20 六月 2023 17:07:42 +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/CodeImprotDataVO.java | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotDataVO.java
index 7ffb90f..73e27a9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotDataVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotDataVO.java
@@ -49,7 +49,7 @@
private List<Map<String,String>> datas = new ArrayList<>();
private CodeClassifyTemplateVO codeClstemplateVO;
private CodeClassifyVO codeClassifyVO;
-
+ private CodeRuleVO codeRuleVO;
public CodeClassifyTemplateVO getCodeClassifyTemplateVO() {
return codeClstemplateVO;
}
@@ -116,18 +116,35 @@
this.fields = fields;
}
- @Override
- public String toString() {
- return "CodeImprotDataVO{" +
- "rowIndex='" + rowIndex + '\'' +
- ", codeClassifyOid='" + codeClassifyOid + '\'' +
- ", templateOid='" + templateOid + '\'' +
- ", codeRuleOid='" + codeRuleOid + '\'' +
- ", fields=" + fields +
- ", colNames=" + colNames +
- ", datas=" + datas +
- ", codeClstemplateVO=" + codeClstemplateVO +
- ", codeClassifyVO=" + codeClassifyVO +
- '}';
- }
+ public CodeClassifyTemplateVO getCodeClstemplateVO() {
+ return codeClstemplateVO;
+ }
+
+ public void setCodeClstemplateVO(CodeClassifyTemplateVO codeClstemplateVO) {
+ this.codeClstemplateVO = codeClstemplateVO;
+ }
+
+ public CodeRuleVO getCodeRuleVO() {
+ return codeRuleVO;
+ }
+
+ public void setCodeRuleVO(CodeRuleVO codeRuleVO) {
+ this.codeRuleVO = codeRuleVO;
+ }
+
+ @Override
+ public String toString() {
+ return "CodeImprotDataVO{" +
+ "rowIndex='" + rowIndex + '\'' +
+ ", codeClassifyOid='" + codeClassifyOid + '\'' +
+ ", templateOid='" + templateOid + '\'' +
+ ", codeRuleOid='" + codeRuleOid + '\'' +
+ ", fields=" + fields +
+ ", colNames=" + colNames +
+ ", datas=" + datas +
+ ", codeClstemplateVO=" + codeClstemplateVO +
+ ", codeClassifyVO=" + codeClassifyVO +
+ ", codeRuleVO=" + codeRuleVO +
+ '}';
+ }
}
--
Gitblit v1.9.3