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

xiaoyong931011

2022-07-08 e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf

 src/main/java/com/xcong/farmer/cms/core/node/Template.java

@@ -63,7 +63,7 @@
        if ("article".equals(templateType)) {
            Object templateName = system.get("templateName");
            if (templateName != null) {
                this.name = (String) templateName;
                this.name = String.valueOf(templateName);
            }
        } else if ("column".equals(templateType)) {
            Object page = system.get("page");