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

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletQrcodeApiServiceImpl.java

@@ -42,7 +42,7 @@ public class AppletQrcodeApiServiceImpl implements AppletQrcodeApiService {
             qrcodePathDTO.setUrl(uploadResult.getUrl());
             qrcodePathDTO.setDownloadUrl(uploadResult.getDownloadUrl());
             qrcodePathDTO.setPath(path+"?pageId="+i);
-            ServiceResponse.success(qrcodePathDTO);
+            return ServiceResponse.success(qrcodePathDTO);
         }
         return ServiceResponse.failure(ErrorCode.SYSTEM_ERROR.getCode(), "生成小程序二维码异常");
     }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/SmsUtils.java

@@ -51,7 +51,7 @@ public class SmsUtils {
         if (StringUtils.isBlank(noticeCode)) {
             return SmsTypeEnum.MARKETING.getCode();
         }
-        if (NoticeConstant.PARAMS_VERIFY_CODE.equals(noticeCode)) {
+        if (NoticeConstant.NOTICE_WXA_VERIFY_CODE.equals(noticeCode)) {
             return SmsTypeEnum.AUTH_CODE.getCode();
         } else {
             return SmsTypeEnum.NOTICE.getCode();