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

xiaoyong931011

2022-07-05 9035f78fbcd60c452b5e37e5687813c35e9c4ff2

 src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java

@@ -25,7 +25,7 @@
    public void articleProcess(Long id, String templateName) {
        Map<String, Object> data = new HashMap<>();
        data.put("id", id);

        data.put("companyId", 0L);
        if (StrUtil.isEmpty(templateName)) {
            templateName = "artile.defualt.html";
        }