From 8e76fba031022a2bb99795a2678c62db33a5ebfd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期三, 24 三月 2021 19:27:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tai-ots-master-20210316' into Dev

---
 src/main/resources/templates/include.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/templates/include.html b/src/main/resources/templates/include.html
index 9e44cb6..343076f 100644
--- a/src/main/resources/templates/include.html
+++ b/src/main/resources/templates/include.html
@@ -173,4 +173,4 @@
 <div th:fragment="bootstrap-table-reorder-js">
 	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder/bootstrap-table-reorder.js}"></script>
 	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder/jquery.tablednd.js}"></script>
-</div>
+</div>
\ No newline at end of file

--
Gitblit v1.9.1