From b50793ad3b5bb667d32d76cc77322a99e6781fa5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 19 九月 2022 00:53:39 +0800
Subject: [PATCH] 优化代码

---
 java110-doc/src/main/resources/static/js/doc-ui.js |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/java110-doc/src/main/resources/static/js/doc-ui.js b/java110-doc/src/main/resources/static/js/doc-ui.js
index 623ca77..ead7809 100644
--- a/java110-doc/src/main/resources/static/js/doc-ui.js
+++ b/java110-doc/src/main/resources/static/js/doc-ui.js
@@ -93,11 +93,7 @@
 
                 //鍙戦�乬et璇锋眰
                Vue.http.get('/doc/api/page', _param)
-<<<<<<< HEAD
                  //Vue.http.get('mock/pages.json', _param)
-=======
-               // Vue.http.get('mock/pages.json', _param)
->>>>>>> cd8657e2dcffe17efd02cd055f8e6dfd6d703c96
                .then(function(res) {
                         _that.pages = res.data;
                         if (_that.pages.length < 1) {

--
Gitblit v1.8.0