Merge remote-tracking branch 'origin/master'

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/mapper/UserOrderPaymentMapper.java

@@ -13,4 +13,5 @@ public interface UserOrderPaymentMapper {
     int updateByPrimaryKeySelective(UserOrderPayment userOrderPayment);
 
 
+    UserOrderPayment selectByOrderNo(String orderSn, String payChannel, String payStaus);
 }