From 560228ac3c15cccce0b2a5994d44e4e81b5b3b73 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 24 May 2022 11:12:22 +0800 Subject: [PATCH] 合并服务单订单改造分支 --- zq-erp/src/main/resources/templates/views/admin/index.html | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/resources/templates/views/admin/index.html b/zq-erp/src/main/resources/templates/views/admin/index.html index bc60ea8..6d15706 100644 --- a/zq-erp/src/main/resources/templates/views/admin/index.html +++ b/zq-erp/src/main/resources/templates/views/admin/index.html @@ -5,7 +5,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="renderer" content="webkit"> <meta http-equiv="Cache-Control" content="no-siteapp"/> - <title></title> + <title>阿尔法云管理系统</title> <!-- 本框架基本脚本和样式 --> <link rel="stylesheet" type="text/css" th:href="@{/plugin/layer/skin/layer.css}"> <script type="text/javascript" @@ -24,7 +24,7 @@ <body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden"> -<div id="wrapper"> +<div id="wrapper" v-cloak> <!--左侧导航开始--> <nav class="navbar-default navbar-static-side" role="navigation"> <div class="nav-close"> @@ -37,7 +37,11 @@ <a id="dLabel" data-toggle="dropdown" class="dropdown-toggle" href="#" aria-haspopup="true" aria-expanded="true"> <span class="clear" style="height: auto;"> <span class="block m-t-xs"> +<<<<<<< HEAD + <strong class="font-bold">阿尔法云管理系统</strong> +======= <strong class="font-bold">{{systemName}}</strong> +>>>>>>> feature/订单服务单代码改造 </span> </span> </a> -- Gitblit v1.9.1