From b7c8258399cfada42f3a704aaee7280f0571f18e Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 27 May 2021 14:57:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=8B=96=E6=8B=BD=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8Dreorder-row-js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{reorder => reorder-row}/bootstrap-table-reorder.js   | 0
 .../{reorder => reorder-row}/jquery.tablednd.js           | 0
 .../main/resources/templates/demo/table/reorderRows.html  | 2 +-
 ruoyi-admin/src/main/resources/templates/include.html     | 8 ++++----
 .../src/main/resources/templates/tool/gen/edit.html       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/{reorder => reorder-row}/bootstrap-table-reorder.js (100%)
 rename ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/{reorder => reorder-row}/jquery.tablednd.js (100%)

diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder/bootstrap-table-reorder.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder-row/bootstrap-table-reorder.js
similarity index 100%
rename from ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder/bootstrap-table-reorder.js
rename to ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder-row/bootstrap-table-reorder.js
diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder/jquery.tablednd.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder-row/jquery.tablednd.js
similarity index 100%
rename from ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder/jquery.tablednd.js
rename to ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder-row/jquery.tablednd.js
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/reorderRows.html b/ruoyi-admin/src/main/resources/templates/demo/table/reorderRows.html
index c283846e..bda2b73e 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/reorderRows.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/reorderRows.html
@@ -15,7 +15,7 @@
 		</div>
 	</div>
     <div th:include="include :: footer"></div>
-    <th:block th:include="include :: bootstrap-table-reorder-js" />
+    <th:block th:include="include :: bootstrap-table-reorder-row-js" />
     <script th:inline="javascript">
         var prefix = ctx + "demo/table";
         var datas = [[${@dict.getType('sys_normal_disable')}]];
diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html
index 1c23240f..905e98df 100644
--- a/ruoyi-admin/src/main/resources/templates/include.html
+++ b/ruoyi-admin/src/main/resources/templates/include.html
@@ -171,15 +171,15 @@
 </div>
 
 <!-- 表格行拖拽插件 -->
-<div th:fragment="bootstrap-table-reorder-js">
-	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder/bootstrap-table-reorder.min.js}"></script>
-	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder/jquery.tablednd.js}"></script>
+<div th:fragment="bootstrap-table-reorder-row-js">
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder-row/bootstrap-table-reorder.js}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder-row/jquery.tablednd.js}"></script>
 </div>
 
 <!-- 表格列拖拽插件 -->
 <div th:fragment="bootstrap-table-reorder-columns-js">
 	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder-columns/jquery.dragtable.js}"></script>
-	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder-columns/bootstrap-table-reorder.js?v=20210202}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder-columns/bootstrap-table-reorder.min.js?v=20210203}"></script>
 </div>
 
 <!-- 表格列宽拖动插件 -->
diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html b/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html
index e6ddfc03..94c71726 100644
--- a/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html
+++ b/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html
@@ -257,7 +257,7 @@
 	</section>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: select2-js" />
-    <th:block th:include="include :: bootstrap-table-reorder-js" />
+    <th:block th:include="include :: bootstrap-table-reorder-row-js" />
     <script th:src="@{/js/jquery.tmpl.js}"></script>
     <th:block th:include="include :: jquery-cxselect-js" />
     <script th:inline="javascript">