Merge branch 'lj-project' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect into lj-project

src/main/java/com/zjty/inspect/utils/FreeMakerUtils.java

@@ -3,6 +3,8 @@ package com.zjty.inspect.utils;
 import com.zjty.inspect.entity.TechnologyContent;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
+import org.springframework.web.servlet.view.freemarker.FreeMarkerConfig;
+import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
 
 import java.io.*;
 import java.util.List;
@@ -13,7 +15,7 @@ public class FreeMakerUtils {
         public static String parseTpl(String viewName, Map params) {
 //            Configuration cfg = SpringContextHolder.getBean(Configuration.class);
             Configuration cfg = new Configuration();
-            cfg.setClassForTemplateLoading(FreeMakerUtils.class, "/templates");
+            cfg.setClassForTemplateLoading(FreeMakerUtils.class, "/templates/");
             Template t = null;
             try {
                 t = cfg.getTemplate(viewName + ".ftl");