From 19f59c243e8df97c8b9fd9dba4e758be8235d68b Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 25 十一月 2025 17:02:54 +0800
Subject: [PATCH] 添加卧转立扫码、卧转立、大车、大理片笼基础任务流转逻辑

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

diff --git a/.gitignore b/.gitignore
index 32858aa..8cb5595 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,17 @@
+<<<<<<< HEAD
+# 蹇界暐鎵�鏈夋ā鍧楃殑target鐩綍锛堥�掑綊鍖归厤鎵�鏈夊瓙鐩綍锛�
+**/target/
+# 蹇界暐target鐩綍涓嬬殑鎵�鏈夋枃浠讹紙闃叉閬楁紡锛�
+**/target/*
+# 鑻ユ湁Gradle妯″潡锛岃ˉ鍏呭拷鐣uild鐩綍
+**/build/
+**/build/*
+# 蹇界暐IDE鐢熸垚鐨勪复鏃舵枃浠讹紙鍙�夛級
+**/.idea/
+**/*.iml
+**/.classpath
+**/.project
+=======
 *.class
 
 # Mobile Tools for Java (J2ME)
@@ -10,3 +24,4 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+>>>>>>> 595aa908e596cfc3ba605fe9afd5ca2e7d0a4901

--
Gitblit v1.8.0