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/CmsTemplateEntity.java

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

    private Long companyId;
}