Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-07-06 aa14085746f7432e61f138c9369e6afa8d34c60c

 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";