fix conflect

Helius

2022-07-05 b95699652357c6218b45eceb81170ddfebb30e1d

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

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

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

    // 栏目目录
    private String path;
}