Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-05 cee43c11fe6772305e19e7ddee1e8276060046d6

 src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java

@@ -51,4 +51,7 @@

    // 是否为导航 1-是 2-否
    private Integer isNav;

    // 栏目目录
    private String path;
}