From 31f7ba2d0746e768042b24d1abf2a8a4b4a15d0b Mon Sep 17 00:00:00 2001
From: ly19960718 <1622779752@qq.com>
Date: Wed, 28 Apr 2021 18:38:54 +0800
Subject: [PATCH] Merge branch 'master' of D:\CF_work\ideaWorkSpace\twoduty
 with conflicts.

---
 src/main/resources/static/route/web/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/static/route/web/index.html b/src/main/resources/static/route/web/index.html
index 2e1d333..a533c65 100644
--- a/src/main/resources/static/route/web/index.html
+++ b/src/main/resources/static/route/web/index.html
@@ -18,7 +18,7 @@
                         <a href="javascript: void(0);">
                             <div class="left fl">
                                 <span>首页</span>
-                                <p>乡镇综合治理平台</p>
+                                <p>众力监督平台</p>
                             </div>
                             <div class="right fr">
                                 <img src="assets/web/images/nav-icon1.png" alt="">