From 9b319f3a8d084babe9a021c151434aae4a2c450d Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 13:40:06 +0800
Subject: [PATCH] LIMS管理系统框架-开发8-21

---
 .gitignore |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6fea1f2..d9f1ef5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,17 @@
+<<<<<<< HEAD
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+=======
 HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar
@@ -32,3 +46,4 @@
 
 ### VS Code ###
 .vscode/
+>>>>>>> 97287ee79f67a623da39650ad9718131e8130cb5

--
Gitblit v1.9.3