From f4c03c18081d9f47acc3c5900889db5529e30d83 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 22 二月 2022 11:55:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-pro-record

---
 .gitignore |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d76c026..51ebf9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,16 +9,16 @@
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
-
+src/main/resources/application-*.yml
 # Package Files #
-*.jar
+#*.jar
 *.war
 *.nar
 *.ear
 *.zip
 *.tar.gz
 *.rar
-
+*.iml
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /.idea/*
@@ -26,3 +26,4 @@
 /.idea/
 /target/
 
+/src/main/resources/static/

--
Gitblit v1.8.0