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

疯狂的狮子li

2021-06-11 a51f7d52ed93f62f5f5eeb445163ab48a523dbe2

 ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

@@ -13,6 +13,9 @@
    /** 树表（增删改查） */
    public static final String TPL_TREE = "tree";

    /** 主子表（增删改查） */
    public static final String TPL_SUB = "sub";

    /** 树编码字段 */
    public static final String TREE_CODE = "treeCode";