Merge remote-tracking branch 'origin/dev' into dev

bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java

@@ -62,7 +62,7 @@ public class TOnlinePaymentServiceImpl extends ServiceImpl<TOnlinePaymentMapper,
             }else{
                 tOnlinePaymentExt.setOrderTypeVal("充值订单");
                 if(ObjectUtil.isEmpty(tOnlinePaymentExt.getMemberCode())){
-                    tOnlinePaymentExt.setOrderTypeVal("注册订单");
+                    tOnlinePaymentExt.setOrderTypeVal("");
                 }
             }
         }

bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml

@@ -30,7 +30,7 @@
 
     <!-- 查询列表 -->
     <select id="queryList" resultType="com.hzs.common.domain.third.pay.ext.TOnlinePaymentExt">
-        select top.*, cm.member_code, cm.member_name,
+        select so.pay_time payTime, cm.phone, top.*, cm.member_code, cm.member_name,
         so.order_type orderType
         from T_ONLINE_PAYMENT top
         left join cu_member cm