From 1798c91f6b0782d1970a8a4fdcaf4a174e68cb61 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 16 五月 2023 10:45:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DriverMapper.xml |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DriverMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DriverMapper.xml
index 5369833..90f1c46 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DriverMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DriverMapper.xml
@@ -49,5 +49,9 @@
         <result column="zfbCollectionCode" property="zfbCollectionCode"/>
         <result column="openid" property="openid"/>
         <result column="openOrderQRCode" property="openOrderQRCode"/>
+        <result column="merchantNumber" property="merchantNumber"/>
+        <result column="merchantName" property="merchantName"/>
+        <result column="merchantPhone" property="merchantPhone"/>
+        <result column="merchantIDCode" property="merchantIDCode"/>
     </resultMap>
 </mapper>

--
Gitblit v1.7.1