From 2686438ad8f3cbdb8deea79de53ffe4bb3e87fb7 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 01 八月 2023 09:11:41 +0800
Subject: [PATCH] 	modified:   src/App.vue 	modified:   src/assets/api/controller.js 	new file:   src/components/view/raw-ins.vue 	modified:   src/components/view/standard-table/technology.vue 	modified:   src/components/view/standard.vue 	modified:   src/view/index.vue

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

diff --git a/README.md b/README.md
index 84e3574..fad88b5 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 鍓嶇涓ぉ娴锋磱
 
 #### 浠嬬粛
@@ -37,3 +38,26 @@
 4.  [GVP](https://gitee.com/gvp) 鍏ㄧО鏄� Gitee 鏈�鏈変环鍊煎紑婧愰」鐩紝鏄患鍚堣瘎瀹氬嚭鐨勪紭绉�寮�婧愰」鐩�
 5.  Gitee 瀹樻柟鎻愪緵鐨勪娇鐢ㄦ墜鍐� [https://gitee.com/help](https://gitee.com/help)
 6.  Gitee 灏侀潰浜虹墿鏄竴妗ｇ敤鏉ュ睍绀� Gitee 浼氬憳椋庨噰鐨勬爮鐩� [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+=======
+# vue_model
+
+> A Vue.js project
+
+## Build Setup
+
+``` bash
+# install dependencies
+npm install
+
+# serve with hot reload at localhost:8080
+npm run dev
+
+# build for production with minification
+npm run build
+
+# build for production and view the bundle analyzer report
+npm run build --report
+```
+
+For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
+>>>>>>> c1c41a4 (棣栨鎻愪氦)

--
Gitblit v1.9.3