From ba345976f0a6a67bcb20627e33251ded000a3d8f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期六, 25 五月 2024 22:40:02 +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/CodeClassifyTemplateAttrVO.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java
index 8134943..9f2d5d1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java
@@ -1,5 +1,7 @@
 package com.vci.ubcs.code.vo.pagemodel;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.vci.ubcs.starter.revision.model.BaseModel;
 import lombok.Data;
 
 /**
@@ -9,7 +11,7 @@
  * @date 2022-01-24
  */
 @Data
-public class CodeClassifyTemplateAttrVO extends BaseModelVO {
+public class CodeClassifyTemplateAttrVO extends BaseModel {
 
 	/**
      * 绂佹淇敼杩欎釜鍊�
@@ -65,6 +67,16 @@
 	* 鐩镐技鏌ラ噸灞炴��
 	*/
 	private String sameRepeatAttrFlag;
+
+	/**
+	 * 杩戜箟璇嶆煡璇㈣鍒�
+	 */
+	private String sysonymRuleOids;
+
+	/**
+	 * 杩戜箟璇嶆煡璇㈣鍒欐樉绀哄��
+	 */
+	private String sysonymRuleOidsText;
 
 	/**
 	* 鏄惁鎺掑簭
@@ -290,6 +302,7 @@
 	 * 绾ц仈鏌ヨ灞炴��
 	 */
 	private String parentQueryAttr;
+
 	/**
 	 * 杈撳叆鎻愮ず
 	 */

--
Gitblit v1.9.3