From e973fb747f0d1a382fb9e4cdb20383a0a546ef67 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 03 十二月 2024 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java |   30 ++++++++++--------------------
 1 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java
index b364cdc..97ba2d2 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java
@@ -107,21 +107,6 @@
     private String linkType = "";
 
     /**
-     * 鏍硅妭鐐规樉绀鸿〃杈惧紡
-     */
-    private String showExpressionRoot = "";
-
-    /**
-     * 鏍戣妭鐐规樉绀鸿〃杈惧紡
-     */
-    private String showExpression = "";
-
-    /**
-     * 鍙傜収鏍戣缃�
-     */
-    private String refTreeSet = "";
-
-    /**
      * 鏄惁鏄剧ず鍥炬爣
      */
     private String isShowImage = "";
@@ -194,6 +179,16 @@
     private String queryTemplateName = "";
 
     /**
+     * cs绔娇鐢ㄧ殑鑷畾涔夋煡璇㈢被鍚嶆垨URL
+     */
+    private String csCustQueryCLsOrUrl = "";
+
+    /**
+     * bs绔娇鐢ㄧ殑鑷畾涔夋煡璇㈢被鍚嶆垨URL
+     */
+    private String bsCustQueryCLsOrUrl = "";
+
+    /**
      * 瀛怳I鐨勪笟鍔$被鍨�
      */
     private String subUIObjType = "";
@@ -202,11 +197,6 @@
      * 鍏宠仈瀛怳I
      */
     private String subUILayout = "";
-
-    /**
-     * UI瀹氫箟
-     */
-    private String uiLayout;
 
     /**
      * 缂栧彿

--
Gitblit v1.9.3