From 41f11d5fd764a2bc7e8463a70bb340467d99a3ca Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 七月 2023 09:42:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java
index 4c4f54e..9f56f4b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java
@@ -2,6 +2,7 @@
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
@@ -11,7 +12,7 @@
  * @date 2019/10/11 5:24 PM
  */
 @Data
-public class BtmTypeVO implements java.io.Serializable{
+public class BtmTypeVO implements Serializable {
 
     /**
      * 绂佹淇敼杩欎釜鍊�
@@ -131,6 +132,10 @@
      */
     private boolean viewFlag;
 
+	/**
+	 * 瑙嗗浘鏄剧ず瀛楁
+	 */
+	private String viewText;
     /**
      * 瑙嗗浘鍒涘缓鐨剆ql璇彞
      */
@@ -139,7 +144,7 @@
     /**
      * 涓氬姟绫诲瀷鍚嶇О
      */
-    private String btmname;
+    private String btmName;
 
     /**
      * 鎷ユ湁鑰�
@@ -174,7 +179,12 @@
 	/**
 	 * 涓氬姟绫诲瀷鎵�灞為鍩�
 	 */
-	private String domain;
+	private String bizDomain;
+
+	/**
+	 * 棰嗗煙鏄剧ず瀛楁
+	 */
+	private String domainText;
 
     /**
      * 鍖呭惈灞炴��

--
Gitblit v1.9.3