Merge branch 'dev'

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -504,7 +504,8 @@ public class CodeServiceImpl implements CodeService {
 						wxMaNewsReq.setMediaId(mediaId);
 						WxResult<byte[]> wxAuditResult = wxMaCodeService.getMaterial(authInfo.getAuthorizerAccessToken(), wxMaNewsReq);
 						MultipartFile file = new MockMultipartFile("file", "QRCode.jpg", "image/jpeg", wxAuditResult.getData());
-						Result<UploadImgResultDTO> uploadResult = ossFeignClient.uploadQrCode(file);
+						//2021.5.7 sun 开发、测试运营端获取审核失败原因都是直接访问生产third服务，没有token 需要业务层传递客户Id
+						Result<UploadImgResultDTO> uploadResult = ossFeignClient.uploadQrCodeV2(file, dto.getCustomerId());
 						urlList.add(uploadResult.getData().getUrl());
 						if (StringUtils.isBlank(screenShotUrl)) {
 							screenShotUrl = uploadResult.getData().getUrl();

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceDetailResultDTO.java

@@ -20,6 +20,11 @@ public class AdviceDetailResultDTO implements Serializable {
      */
     private String adviceId;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
     /**
      * 客户名
      */