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

@@ -11,7 +11,9 @@ import java.util.Map;
 public class FreeMakerUtils {
 
         public static String parseTpl(String viewName, Map params) {
-            Configuration cfg = SpringContextHolder.getBean(Configuration.class);
+//            Configuration cfg = SpringContextHolder.getBean(Configuration.class);
+            Configuration cfg = new Configuration();
+            cfg.setClassForTemplateLoading(FreeMakerUtils.class, "/templates");
             Template t = null;
             try {
                 t = cfg.getTemplate(viewName + ".ftl");