Merge remote-tracking branch 'origin/dev' into dev

pz-merchant/src/main/java/com/pz/merchant/controller/applet/WechatLoginController.java

@@ -86,7 +86,7 @@ public class WechatLoginController extends BaseController {
     @SaIgnore
     @SaIgnore
     @GetMapping("wxopenid")
     @GetMapping("wxopenid")
     public void wxopenid(String userId, String code, String state, HttpServletResponse response) throws IOException {
     public void wxopenid(String userId, String code, String state, HttpServletResponse response) throws IOException {
-        String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx6cc2fd1bca9472ae&secret=2edf95828b1a19fc5149f6650cde71f1&code=" + code
+        String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wxab851ed88308824f&secret=9a548dfb2c497fd73ed92ed34e5f4242&code=" + code
             + "&grant_type=authorization_code";
             + "&grant_type=authorization_code";
         RestTemplate restTemplate = new RestTemplate();
         RestTemplate restTemplate = new RestTemplate();
         String result = restTemplate.getForObject(url, String.class);
         String result = restTemplate.getForObject(url, String.class);