From bf8d8aaf62190e0d49bbd34e3bb2aa7707d86537 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期三, 22 五月 2024 10:05:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-admin/src/main/resources/templates/main - 副本.html | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git "a/javaweb-plus/javaweb-admin/src/main/resources/templates/main - \345\211\257\346\234\254.html" "b/javaweb-plus/javaweb-admin/src/main/resources/templates/main - \345\211\257\346\234\254.html"
index ebcee67..6d36a76 100644
--- "a/javaweb-plus/javaweb-admin/src/main/resources/templates/main - \345\211\257\346\234\254.html"
+++ "b/javaweb-plus/javaweb-admin/src/main/resources/templates/main - \345\211\257\346\234\254.html"
@@ -2,16 +2,15 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('寮瑰眰缁勪欢')" />
-<link href="../static/css/bootstrap.min.css"
- th:href="@{/css/bootstrap.min.css}" rel="stylesheet" />
-<link href="../static/css/font-awesome.min.css"
- th:href="@{/css/font-awesome.min.css}" rel="stylesheet" />
-<link href="../static/css/main/animate.min.css"
- th:href="@{/css/main/animate.min.css}" rel="stylesheet" />
-<link href="../static/css/main/style.min862f.css"
- th:href="@{/css/main/style.min862f.css}" rel="stylesheet" />
+<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet" />
+<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet" />
+<link href="../static/css/main/animate.min.css" th:href="@{/css/main/animate.min.css}" rel="stylesheet" />
+<link href="../static/css/main/style.min862f.css" th:href="@{/css/main/style.min862f.css}" rel="stylesheet" />
<link rel="stylesheet" th:href="@{/css/custom/main.css}" />
<th:block th:include="include :: datetimepicker-css" />
+
+<link rel="stylesheet" href="../static/css/bootstrap.min.css" th:href="@{/js/elementUI/index.css}" />
+
<style type="text/css">
.div_any_child {
width: 100%;
--
Gitblit v1.9.1