From 481bf716b9b42831b4d6100639559c9cdae875ca Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Feb 2023 12:41:01 +0800
Subject: [PATCH] 商品单位

---
 src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderVo.java                |    2 ++
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java |    1 +
 src/main/resources/templates/febs/views/modules/order/deliverGoods.html   |    1 +
 3 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
index 6a55b29..e8a8763 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -68,6 +68,7 @@
     @RequiresPermissions("deliverGoods:update")
     public String deliverGoods(@PathVariable long id, Model model) {
         AdminMallOrderVo data = adminMallOrderService.getMallOrderInfoById(id);
+        data.setExpressCom("中通快递");
         model.addAttribute("deliverInfo", data);
         return FebsUtil.view("modules/order/deliverGoods");
     }
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderVo.java
index a259a89..cd2594b 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderVo.java
@@ -14,4 +14,6 @@
     private String phone;
 
     private String address;
+
+    private String expressCom;
 }
diff --git a/src/main/resources/templates/febs/views/modules/order/deliverGoods.html b/src/main/resources/templates/febs/views/modules/order/deliverGoods.html
index 3f43912..5d93b0c 100644
--- a/src/main/resources/templates/febs/views/modules/order/deliverGoods.html
+++ b/src/main/resources/templates/febs/views/modules/order/deliverGoods.html
@@ -89,6 +89,7 @@
                 "id": deliverInfo.id,
                 "name": deliverInfo.name,
                 "phone": deliverInfo.phone,
+                "expressCom": deliverInfo.expressCom,
                 "address": deliverInfo.address
             });
         }

--
Gitblit v1.9.1