合并JWL,WZY,TRM代码

Change-Id: Ifb4fcad3c06733e1e005e7d8d9403e3561010fb4
diff --git a/.gitignore b/.gitignore
index efc0820..d2bc02a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 .env.production
 .env.development
 package-lock.json
+Merge/front/node_modules