From e497a05ce312d26864b0c23cad97da9eb32c2cc1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 16:01:34 +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 |    6 ++++++
 1 files changed, 6 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 a626a11..e458de1 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,
@@ -120,4 +122,8 @@
     <select id="selectJhyInfoByUserId" resultType="com.xzx.gc.entity.JhyInfo">
         select * from xzx_jhy_info where id = #{jhyId}
     </select>
+
+    <select id="selectAddRessInfoByUserId" resultType="com.xzx.gc.entity.AddressInfo">
+        select * from xzx_user_address_info where user_id = #{userId}
+    </select>
 </mapper>

--
Gitblit v1.9.1