From 76293d27f60ca77343e77d35bfbfae97cdc6035f Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期三, 24 五月 2023 18:34:37 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
index e05cbd7..ce80f90 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
@@ -1,9 +1,17 @@
 package com.vci.ubcs.code.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
+import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import org.apache.commons.math3.util.Precision;
+import org.aspectj.weaver.ast.Not;
+import org.ietf.jgss.Oid;
+
+import java.util.List;
 
 /**
  * 鐮佹鍩虹淇℃伅鏁版嵁鎿嶄綔灞�
@@ -20,6 +28,11 @@
 	 * 搴忓垪鍖�
 	 */
 	private static final long serialVersionUID = 957685333614390234L;
+
+	/**
+	 * 绉熸埛ID
+	 */
+	private String tenantId;
 
 	/**
 	 * 鍙傜収鐨勪笟鍔＄被鍨�
@@ -131,5 +144,16 @@
 	 */
 	private Integer orderNum;
 
+	/**
+	 * 鏄剧ず鐨勫睘鎬�-鏄剧ず瀵硅薄
+	 */
+	@TableField(exist = false)
+	private List<CodeShowFieldConfig> codeShowFieldConfigs;
+
+	/**
+	 * 鏌ヨ鏉′欢鏄剧ず瀵硅薄
+	 */
+	@TableField(exist = false)
+	private List<CodeSrchCondConfig> codeSrchCondConfigs;
 
 }

--
Gitblit v1.9.3