diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index a29d0607..ffa753b4 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -1632,6 +1632,8 @@ public class OrderController extends BaseController {
                     && master.getWorkerId() != null;
             logger.info("是否为监控单{}主单id{}", condition,master);
             // 编辑返回属性
+            orderListResponse.setOrderType(master.getOrderType());
+            orderListResponse.setHasServiceOrder(master.getHasServiceOrder());
             orderListResponse.setIsMonitoredOrder(condition);
             orderListResponse.setGoodsBrand(master.getGoodsBrand());
             orderListResponse.setGoodsSpecification(master.getGoodsSpecification());
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 681e5101..7ec58522 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -869,6 +869,8 @@ public class OrderMasterController extends BaseController {
             }
 
             // 编辑返回属性
+            orderListResponse.setOrderType(master.getOrderType());
+            orderListResponse.setHasServiceOrder(master.getHasServiceOrder());
             orderListResponse.setPaymentMoney(paymentMoney);
             orderListResponse.setGoodsBrand(master.getGoodsBrand());
             orderListResponse.setGoodsSpecification(master.getGoodsSpecification());
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index c75298bf..2ca44508 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -208,4 +208,9 @@ public class OrderListResponse {
     private  String  addMoneyRemark;
 
     private BigDecimal paymentMoney;
+
+    /**
+     * 是否已派发服务订单：0=未派发，1=已派发
+     */
+    private Integer hasServiceOrder;
 }
diff --git a/ghy-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js b/ghy-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js
index bb3002d1..c093651b 100644
--- a/ghy-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js
+++ b/ghy-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js
@@ -273,8 +273,7 @@
                 var _defaultRootFlag = item[options.parentCode] == '0' ||
                 item[options.parentCode] == 0 ||
                 item[options.parentCode] == null ||
-                item[options.parentCode] == '' ||
-                $.inArray(item[options.code], parentCodes) > 0 && !rootFlag;
+                item[options.parentCode] == '';
                 if (!item[options.parentCode] || (_root ? (item[options.parentCode] == options.rootIdValue) : _defaultRootFlag)) {
                 	rootFlag = true;
                 	if (!target.data_list["_root_"]) {
diff --git a/ghy-admin/src/main/resources/templates/include.html b/ghy-admin/src/main/resources/templates/include.html
index d1460065..80f9eabd 100644
--- a/ghy-admin/src/main/resources/templates/include.html
+++ b/ghy-admin/src/main/resources/templates/include.html
@@ -30,7 +30,7 @@
 	<script th:src="@{/ajax/libs/validate/jquery.validate.extend.js?v=1.19.3}"></script>
 	<script th:src="@{/ajax/libs/validate/messages_zh.js?v=1.19.3}"></script>
 	<!-- bootstrap-table 表格树插件 -->
-	<script th:src="@{/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.min.js?v=1.18.3}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js?v=1.18.3}"></script>
 	<!-- 遮罩层 -->
 	<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js?v=2.70.0}"></script>
     <script th:src="@{/ajax/libs/iCheck/icheck.min.js?v=1.0.3}"></script>