diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index 20e1eed9..bc0d323e 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -497,6 +497,11 @@ public class OrderDetailController extends BaseController {
logger.info("所有的加价订单{}",financialChangeRecords);
// 编辑返回属性
+ orderListResponse.setTrackingNumber(orderMaster.getTrackingNumber());
+ orderListResponse.setDeliveryImages(orderMaster.getDeliveryImages());
+ orderListResponse.setDeliveryRemark(orderMaster.getDeliveryRemark());
+ orderListResponse.setDeliveryType(orderMaster.getDeliveryType());
+
orderListResponse.setAddMoneyRemark(addMoneyRemark);
orderListResponse.setAddMoney(addMoneyTotal);
orderListResponse.setOrderDetailId(detail.getId());
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 0403d7bd..0d8bf24e 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
@@ -258,4 +258,23 @@ public class OrderListResponse {
private Integer deliveryType;
private Long goodsId;
+
+
+ /**
+ * 发货备注
+ */
+ @Excel(name = "发货备注", cellType = Excel.ColumnType.STRING)
+ private String deliveryRemark;
+
+ /**
+ * 发货图片
+ */
+ @Excel(name = "发货图片", cellType = Excel.ColumnType.STRING)
+ private String deliveryImages;
+
+
+ /**
+ * 快递单号
+ */
+ private String trackingNumber;
}
diff --git a/ghy-admin/src/main/resources/templates/worker/worker.html b/ghy-admin/src/main/resources/templates/worker/worker.html
index 89f2022b..1f4d7bd6 100644
--- a/ghy-admin/src/main/resources/templates/worker/worker.html
+++ b/ghy-admin/src/main/resources/templates/worker/worker.html
@@ -245,7 +245,7 @@
var actions = [];
actions.push('服务区域 ');
actions.push('服务技能 ');
- actions.push('删除 ');
+ // actions.push('删除 ');
return actions.join('');
} else {
return "";