From c4bade94a970fca41493ec5a8e02a91219248a57 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 01 Dec 2021 10:47:47 +0800 Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop --- gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml index 9fb109c..6ef8cc2 100644 --- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml +++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml @@ -12,6 +12,8 @@ a.reserve_time reserveTime, a.status status, a.remark remark, + a.unit_name unitName, + a.house_number houseNumber, a.username name, b.mobile_phone mobilePhone, d.mobile jhyMobilePhone, @@ -73,6 +75,8 @@ b.mobile_phone mobilePhone, a.area area, a.address address, + a.unit_name unitName, + a.house_number houseNumber, date_format(a.reserve_date,'%Y-%m-%d') reserveDate, a.reserve_time reserveTime, a.status status, -- Gitblit v1.9.1