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

# Conflicts: # src/main/java/com/zjty/inspect/utils/DocumentWordUtil.java

Merge branch 'lj-project' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect into lj-project
935b8bb8 · 孙洁清 · 4184caca · 935b8bb8 · 935b8bb8
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,3 @@ build/
 ### VS Code ###
 .vscode/
-/src/main/resources/
--- a/src/main/resources/templates/reportTemplate.ftl
+++ b/src/main/resources/templates/reportTemplate.ftl