From f7017a21c1955f418d902d579fcaa248ef0b6194 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Wed, 14 Jun 2023 21:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=20=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8D=95=20+=20=E5=95=86=E5=AE=B6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/order/master.html | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html
index a010cbb0..2e05226a 100644
--- a/ghy-admin/src/main/resources/templates/order/master.html
+++ b/ghy-admin/src/main/resources/templates/order/master.html
@@ -432,9 +432,9 @@
                             + '<small> 订单编号：' + row.code + '<small/> <br>'
                             + '<h4> ' + value.goodsName + '<h4/>'
                             // + '<small> ' + value.goodsDesc + '</small> <br>'
-                            + '<small> 联系人：' + row.addressName + '</small> <br>'
-                            + '<small> 联系电话：' + row.addressPhone + '</small> <br>'
-                            + '<small> 联系地址：' + row.address + '</small> <br>'
+                            + '<small>' + row.addressName + '</small> <br>'
+                            + '<small>' + row.addressPhone + '</small> <br>'
+                            + '<small>' + row.address + '</small> <br>'
                             + '<small> 下单时间：' + row.createTime + '</small> <br>'
                             + '<small> 预约时间：' + row.expectTimeStart + ' - ' + row.expectTimeEnd + '</small> <br>'
                             + '<small> 总金额：' + row.financialMasterMoney + '元    应得金额：' + row.financialDetailMoney + '元</small> <br>'
@@ -454,8 +454,10 @@
                     field: 'worker',
                     title: '接单信息',
                     formatter: function (value, row, index) {
-<!--                        return '<small>' + value.name + value.phone + '</small><br>'-->
-<!--                            + '<small>接单时间：' + row.revTime + '</small>';-->
+                        if(value){
+                            return '<small>' + value.name + value.phone + '</small><br>'
+                                + '<small>接单时间：' + value.createTime + '</small>';
+                        }
                     }
                 },
                 {
@@ -476,8 +478,10 @@
                     field: 'goodsWorker',
                     title: '商家信息',
                     formatter: function (value, row, index) {
-<!--                        return '<small>' + value.name + '</small><br>'-->
-<!--                            + '<small>' + value.phone + '</small>';-->
+                        if(value){
+                            return '<small>' + value.name + '</small><br>'
+                                + '<small>' + value.phone + '</small>';
+                        }
                     }
                 },
                 {