fix conflect

Helius

2022-07-05 b95699652357c6218b45eceb81170ddfebb30e1d

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

@@ -22,4 +22,6 @@
     * 类型 1-文件 2-代码
     */
    private Integer type;

    private Long companyId;
}