Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -154,7 +154,7 @@ public class StudentOrderController extends BaseController {
         String appId = "wxcf8e8b33a9477845";
         String appSecret = "1286452b9c68b13325dece7cdf892645";
         String wxMpOAuth2AccessTokenUrl = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code";
-        payChannel = PayChannelEnum.ALIPAY_QR.getCode();
+        //payChannel = PayChannelEnum.ALIPAY_QR.getCode();
 //        if (!new Pay().verifySign(amount, orderNo, notifyUrl, orderSubject, orderBody,sign)) {
 //            return failed("签名验证失败");
 //        }