Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!912

mp-service/src/main/java/com/qs/mp/pay/service/impl/WalletServiceImpl.java

@@ -299,8 +299,8 @@ public class WalletServiceImpl implements IWalletService {
       sendData.put("shop_no", channelPayShopNo);
       sendData.put("sign",channelPaySign);
     } else {
-      sendData.put("shop_no", userPayShopNo);
-      sendData.put("sign",userPaySign);
+      sendData.put("shop_no", msdqPayShopNo);
+      sendData.put("sign", msdqPaySign);
     }
     sendData.put("timestamp",System.currentTimeMillis());
     sendData.put("order_no",payOrder.getOrderId());