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

xiaogang

2021-08-20 47f882588d1d18df404478bc79cc53cb608549a2

 service-front/src/main/java/com/java110/front/controller/wechat/WechatGatewayController.java

old mode 100644
new mode 100755
@@ -170,7 +170,7 @@
            IPageData pd = PageData.newInstance().builder("-1", "", "", paramIn.toJSONString(),
                    "", "", "", "",
                    java110AppId);
            responseEntity = wechatGatewaySMOImpl.gateway(pd);
            responseEntity = wechatGatewaySMOImpl.gateway(pd,wId);

        } catch (Exception e) {
            // TODO Auto-generated catch block