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 |   82 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 82 insertions(+), 0 deletions(-)

diff --git a/README.md b/README.md
index 9f8202c..2b7dde0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,86 @@
+<<<<<<< HEAD
+# JeecgUniapp椤圭洰浠嬬粛
+JeecgBoot - APP绉诲姩瑙ｅ喅鏂规锛岄噰鐢╱niapp妗嗘灦锛屼竴浠戒唬鐮佸缁堢閫傞厤锛屽悓鏃舵敮鎸丄PP銆佸皬绋嬪簭銆丠5锛佸疄鐜颁簡涓嶽JeecgBoot浣庝唬鐮佸钩鍙癩(https://github.com/jeecgboot/jeecg-boot)瀹岀編瀵规帴锛佺洰鍓嶅凡缁忓疄鐜扮櫥褰曘�佺敤鎴蜂俊鎭�侀�氳褰曘�佸叕鍛娿�佺Щ鍔ㄩ椤点�佷節瀹牸绛夊熀纭�鍔熻兘锛屾洿澶氬姛鑳借鑷繁鎵╁睍銆�
+
+褰撳墠鏈�鏂扮増鏈細 2.0锛堝彂甯冩棩鏈燂細2020-07-05锛�
+
+
+[![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
+[![](https://img.shields.io/badge/Author-鍖椾含鍥界偓杞欢-orange.svg)](http://www.jeecg.com)
+[![](https://img.shields.io/badge/Blog-瀹樻柟鍗氬-blue.svg)](https://my.oschina.net/jeecg)
+[![](https://img.shields.io/badge/version-3.4.1-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
+[![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)
+
+
+> 鏈」鐩叧闂璱ssue锛岄亣鍒癇UG鍙互鍦╣ithub涓� [鍙慖ssue](https://github.com/jeecgboot/jeecg-uniapp/issues/new)
+
+### 婧愮爜涓嬭浇
+- https://github.com/jeecgboot/jeecg-uniapp
+- https://gitee.com/jeecg/jeecg-uniapp
+
+
+### 鍚庡彴浠ｇ爜
+-  https://github.com/jeecgboot/jeecg-boot
+
+### 鎶�鏈枃妗�
+- APP浣撻獙锛�   http://jeecg.com/appIndex
+- 鎶�鏈畼缃戯細 [http://www.jeecg.com](http://www.jeecg.com)
+- 鎶�鏈枃妗ｏ細 [http://doc.jeecg.com/2044258](http://doc.jeecg.com/2044258)
+- 瑙嗛鏁欑▼锛� [闆跺熀纭�鍏ラ棬瑙嗛](https://www.bilibili.com/video/BV1sQ4y1R7Rz)
+- 瀹樻柟鏀寔锛� http://jeecg.com/doc/help
+
+
+
+
+
+鏁堟灉棰勮
+----
+
+![](https://oscimg.oschina.net/oscnet/up-9fb74025440e6066651599d78b4bc78f2cd.png)
+
+![](https://oscimg.oschina.net/oscnet/up-7605e213638a559bba64279b6db93af3ed0.png)
+
+![](https://oscimg.oschina.net/oscnet/up-43ddd52486509ab06a920c3f99f42b8b432.png)
+
+![](https://oscimg.oschina.net/oscnet/up-02d83a8fe3fab4c0153862a9084f8a94cbb.png)
+
+![](https://oscimg.oschina.net/oscnet/up-937a63d5e13869c40e6f1437452171d8235.png)
+
+![杈撳叆鍥剧墖璇存槑](https://oscimg.oschina.net/oscnet/up-49e27699eb278c7c6b6748bfeaeb6c13b72.gif "鍦ㄨ繖閲岃緭鍏ュ浘鐗囨爣棰�")
+
+
+
+### 鍔熻兘妯″潡
+```
+鈹溾攢妗嗘灦瀹炵幇
+鈹�  鈹溾攢APP寮�鍙戞鏋舵惌寤�
+鈹�  鈹溾攢鐧诲綍瀵规帴
+鈹�  鈹溾攢TOKEN鎺ュ彛鏈哄埗
+鈹�  鈹溾攢鐑洿鏂癨瑕嗙洊鏇存柊
+鈹溾攢鍩虹鍔熻兘
+鈹�  鈹溾攢鑿滃崟鏍忕洰
+鈹�  鈹溾攢鐧诲綍椤甸潰
+鈹�  鈹溾攢绉诲姩棣栭〉
+鈹�  鈹溾攢涓汉淇℃伅璁剧疆
+鈹溾攢娑堟伅涓績
+鈹�  鈹溾攢閫氳褰�
+鈹�  鈹溾攢绯荤粺鍏憡
+鈹�  鈹溾攢娑堟伅鎺ㄩ��
+鈹溾攢绀轰緥浠ｇ爜
+鈹�  鈹溾攢璋冪敤鎽勫儚澶存壂鐮�(鎵爜)
+鈹�  鈹溾攢鑾峰彇鍦扮悊浣嶇疆(瀹氫綅)
+鈹溾攢鏂板缁勪欢
+鈹�  鈹溾攢椤甸潰婊氬姩
+鈹�  鈹溾攢鏃ュ巻
+鈹�  鈹溾攢鏃堕棿閫夋嫨
+鈹�  鈹溾攢涓嬫媺閫夋嫨
+鈹�  鈹溾攢鍥剧墖涓婁紶
+鈹溾攢銆傘�傘��
+```
+=======
 ## xhj_app
 
 鏂扮伀鐐珹PP浠ｇ爜
 
+>>>>>>> cef8c5e91c4df71323bf373f1625036ea14a3cea

--
Gitblit v1.9.3