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

支付增加订单描述

See merge request quanshu/mp-server!452

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

@@ -231,11 +231,11 @@ public class WalletServiceImpl implements IWalletService {
     sendData.put("pay_resource" , PAY_RESOURCE); //支付来源 1:支付宝  2:微信支付 5：云闪付
     sendData.put("trans_type_code" , PAY_RESOURCE_TYPE); //1017：微信小程序
     sendData.put("transaction_amount" , money);
-    sendData.put("order_remark" , orderRemark);
+    sendData.put("order_remark" , "");
     sendData.put("timestamp" , System.currentTimeMillis());
     sendData.put("callback_url" , callbackUrl);
 
-    sendData.put("order_name" , "订单支付");
+    sendData.put("orderName" , orderRemark);
     sendData.put("sign" , sign);
     sendData.put("client_ip" , "113.31.163.91");