Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-06-10 b348b766fc4cd9079d1bee1fed32fc21bfe01436

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