From 91c6ae307de58c5fcbf815f92a90295b4246cd51 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 25 四月 2021 10:40:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 746f4b6..56b46ba 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -54,6 +54,9 @@
     /** Layout缁勪欢鏍囪瘑 */
     public final static String LAYOUT = "Layout";
 
+    /** ParentView缁勪欢鏍囪瘑 */
+    public final static String PARENT_VIEW = "ParentView";
+
     /** 鏍¢獙杩斿洖缁撴灉鐮� */
     public final static String UNIQUE = "0";
     public final static String NOT_UNIQUE = "1";

--
Gitblit v1.9.3