Merge branch 'master' into 'test'

罗元桥

2021-07-24 f3c4034ebbed90f57f7ab5cc173bea115fe91b05

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java

@@ -115,7 +115,8 @@
                }
            } catch (WxErrorException e) {
                log.error("微信审核图片出错【{}】", e.getMessage());
                e.printStackTrace();
                return R.fail("图片上传失败");
//                e.printStackTrace();
            }
            sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
            sftp.logout();