From 849a9907e793fed3bb18df542090e4a1f4e4f429 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 28 八月 2023 11:58:55 +0800
Subject: [PATCH] 冲突

---
 minipro_standard/main.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/minipro_standard/main.js b/minipro_standard/main.js
index 4686581..af1b29b 100644
--- a/minipro_standard/main.js
+++ b/minipro_standard/main.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import App from './App'
 import mixin from './common/mixin'
+
 // 寮曞叆鍏ㄥ眬uView
 import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)

--
Gitblit v1.9.3