From 96f548cbddff2a3cae98382f89e55af247089f55 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期四, 30 三月 2023 18:30:35 +0800
Subject: [PATCH] 3.30日提交

---
 README.md |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/README.md b/README.md
index f2ec103..a78d3e6 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
@@ -94,4 +95,36 @@
 
 ## 鑻ヤ緷鍓嶅悗绔垎绂讳氦娴佺兢
 
-QQ缇わ細 [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![鍔犲叆QQ缇(https://img.shields.io/badge/108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) 鐐瑰嚮鎸夐挳鍏ョ兢銆�
\ No newline at end of file
+QQ缇わ細 [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![鍔犲叆QQ缇(https://img.shields.io/badge/108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) 鐐瑰嚮鎸夐挳鍏ョ兢銆�
+=======
+## 寮�鍙�
+
+```bash
+# 鍏嬮殕椤圭洰
+git clone https://gitee.com/y_project/RuoYi-Vue
+
+# 杩涘叆椤圭洰鐩綍
+cd ruoyi-ui
+
+# 瀹夎渚濊禆
+npm install
+
+# 寤鸿涓嶈鐩存帴浣跨敤 cnpm 瀹夎渚濊禆锛屼細鏈夊悇绉嶈寮傜殑 bug銆傚彲浠ラ�氳繃濡備笅鎿嶄綔瑙e喅 npm 涓嬭浇閫熷害鎱㈢殑闂
+npm install --registry=https://registry.npmmirror.com
+
+# 鍚姩鏈嶅姟
+npm run dev
+```
+
+娴忚鍣ㄨ闂� http://localhost:80
+
+## 鍙戝竷
+
+```bash
+# 鏋勫缓娴嬭瘯鐜
+npm run build:stage
+
+# 鏋勫缓鐢熶骇鐜
+npm run build:prod
+```
+>>>>>>> 802423e8 (3.30)

--
Gitblit v1.9.1