diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java index 15e419b..7e0fa47 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java @@ -438,15 +438,11 @@ public class WechatWeappCodeController { WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); WxOpenResult openRet = openMaService.releaesAudited(); logger.info(openRet.toString()); -<<<<<<< HEAD - if(openRet.isSuccess()) { -======= boolean releaseSuccess = false; if(openRet.isSuccess()) { releaseSuccess = true; } if(releaseSuccess) { ->>>>>>> refs/tags/jenkins-back_end_wechat-98 releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); } else { if(openRet.getErrcode().equalsIgnoreCase("85052")) { // app is already released