From 761e5c5fa871959f60e15c971c8d83f2b53d0af5 Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期日, 30 八月 2026 15:41:28 +0800
Subject: [PATCH] init

---
 .gitignore |   12 ++++++++++++
 README.md  |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 947d74e..095b35a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Compiled class file
 *.class
 
@@ -7,12 +8,17 @@
 # BlueJ files
 *.ctxt
 
+=======
+*.class
+
+>>>>>>> cce85ae68e917f3422992c2e331347ed72b3cf22
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
 # Package Files #
 *.jar
 *.war
+<<<<<<< HEAD
 *.nar
 *.ear
 *.zip
@@ -52,3 +58,9 @@
 .vite/
 /core/backend/
 /classpath:substitule.json
+=======
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+>>>>>>> cce85ae68e917f3422992c2e331347ed72b3cf22
diff --git a/README.md b/README.md
index 9de01b4..408d42c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <p align="center"><a href="https://dataease.cn"><img src="https://dataease.oss-cn-hangzhou.aliyuncs.com/img/dataease-logo.png" alt="DataEase" width="300" /></a></p>
 <h3 align="center">浜轰汉鍙敤鐨勫紑婧� BI 宸ュ叿</h3>
 <p align="center">
@@ -221,4 +222,10 @@
 suspend=n锛氬叧閿弬鏁般�俷 琛ㄧず绋嬪簭鍚姩鍚庣珛鍗宠繍琛岋紱濡傛灉浣犳兂璋冭瘯鍚姩闃舵锛堟瘮濡傜壒瀹氱殑 init 鏂规硶鎴� Schema 娉ㄥ唽杩囩▼锛夛紝璇锋敼涓� suspend=y锛岃繖鏍风▼搴忎細鍋滃湪鍚姩棣栬锛岀洿鍒颁綘鐢� IDEA 杩炴帴涓婂幓鎵嶄細缁х画銆�
 address=*:5005锛氱洃鍚� 5005 绔彛銆�* 琛ㄧず鍏佽浠讳綍 IP 杩炴帴锛堝鏋滄槸杩滅▼璋冭瘯蹇呭姞锛夈��
 
-```
\ No newline at end of file
+```
+=======
+## dataez
+
+dataease
+
+>>>>>>> cce85ae68e917f3422992c2e331347ed72b3cf22

--
Gitblit v1.9.1