feat：修复merchantName无法获取问题

src/main/java/com/gxwebsoft/shop/mapper/xml/OrderPayMapper.xml

@@ -4,7 +4,10 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*,b.real_name,c.equipment_name,c.battery_model,d.merchant_name
+        SELECT a.*,
+        b.real_name,c.equipment_name,c.battery_model,
+        c.equipment_code,
+        d.merchant_name as merchantName,d.merchant_code
         FROM shop_order_pay a
         LEFT JOIN sys_user b ON a.user_id = b.user_id
         LEFT JOIN apps_equipment c ON a.equipment_id = c.equipment_id
@@ -25,7 +28,7 @@
             <if test="param.merchantCode != null">
                 AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
             </if>
-            <if test="param.createTimeStart != null">
+           <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
             </if>
             <if test="param.createTimeEnd != null">