Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/ygj/yuemum/component/Constant.java

src/main/java/com/ygj/yuemum/controller/pay/CustomerPayController.java

@@ -68,9 +68,9 @@ public class CustomerPayController {
         customerPay.setCp_orderstatus(2);
         customerPay.setCp_ordertype(2);
         customerPay.setOut_trade_no(params.get("orderNo"));
-        if (params.get("channel").equals("wx_pub_qr")) {
+        if (params.get("channel").equals("alipay_ys_qr")) {
             customerPay.setCp_paytype("2");
-        } else if (params.get("channel").equals("wx_pub_qr")) {
+        } else if (params.get("channel").equals("wx_ys_qr")) {
             customerPay.setCp_paytype("1");
         } else {
             return 0;