From e861c9dfab7d74444593b3cfa866544d648dca7f 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/master' into wvp-pro-record

---
 .gitignore |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a1c2a23..51ebf9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,15 +9,21 @@
 
 # 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/*
+/target/*
+/.idea/
+/target/
+
+/src/main/resources/static/

--
Gitblit v1.8.0