From 1bc8f80935add7215fa98de1ab8b375b222a2046 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期四, 24 七月 2025 17:14:35 +0800
Subject: [PATCH] 冲突处理

---
 README.md |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/README.md b/README.md
index 80279fe..2b7dde0 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # JeecgUniapp椤圭洰浠嬬粛
 JeecgBoot - APP绉诲姩瑙ｅ喅鏂规锛岄噰鐢╱niapp妗嗘灦锛屼竴浠戒唬鐮佸缁堢閫傞厤锛屽悓鏃舵敮鎸丄PP銆佸皬绋嬪簭銆丠5锛佸疄鐜颁簡涓嶽JeecgBoot浣庝唬鐮佸钩鍙癩(https://github.com/jeecgboot/jeecg-boot)瀹岀編瀵规帴锛佺洰鍓嶅凡缁忓疄鐜扮櫥褰曘�佺敤鎴蜂俊鎭�侀�氳褰曘�佸叕鍛娿�佺Щ鍔ㄩ椤点�佷節瀹牸绛夊熀纭�鍔熻兘锛屾洿澶氬姛鑳借鑷繁鎵╁睍銆�
 
@@ -77,3 +78,9 @@
 鈹�  鈹溾攢鍥剧墖涓婁紶
 鈹溾攢銆傘�傘��
 ```
+=======
+## xhj_app
+
+鏂扮伀鐐珹PP浠ｇ爜
+
+>>>>>>> cef8c5e91c4df71323bf373f1625036ea14a3cea

--
Gitblit v1.9.3