From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 .gitattributes |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..9d75fff
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,41 @@
+# Set default behavior to automatically normalize line endings
+* text=auto
+
+# Java sources
+*.java text eol=lf
+*.xml text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf
+*.properties text eol=lf
+*.sql text eol=lf
+*.md text eol=lf
+*.json text eol=lf
+*.txt text eol=lf
+
+# Build
+*.gradle text eol=lf
+pom.xml text eol=lf
+
+# Shell scripts
+*.sh text eol=lf
+
+# 鐜板満娑堣垂鏂囦欢锛圵indows 妫�鍑哄繀椤讳繚鎸� LF锛�.env 鍊煎熬闅� \r 浼氭瘨鍖栧瘑鐮�/compose 鍙橀噺锛�
+# Makefile 閰嶆柟涓� nginx.conf 鍚岀悊锛涘搴� Windows Server + Git Bash 閮ㄧ讲璺嚎锛�
+.env.example text eol=lf
+*.conf text eol=lf
+Makefile text eol=lf
+
+# Windows scripts
+*.bat text eol=crlf
+*.cmd text eol=crlf
+
+# Docker
+Dockerfile text eol=lf
+
+# Binary files
+*.jar binary
+*.class binary
+*.png binary
+*.jpg binary
+*.gif binary
+*.ico binary

--
Gitblit v1.8.0