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

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java

@@ -218,13 +218,13 @@ public class MaterialServiceImpl implements MaterialService {
               // 朋友圈上传接口
               if (type == 2) {
                   if(url.contains("?")) {
-                      
-                  }else {
-                      url+= "?imageView2/2/w/1440/h/1080" ;
+                     logger.info("url有参数={}",url);
+                     url = url.split("\\?")[0] ;
                   }
+                  url+= "?imageView2/2/w/1440/h/1080" ;
+                  logger.info("url={}",url);
+                  jp = qywxSuiteApiService.uploadAttachment(qwDTO.getThirdCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());
               }
-              logger.info("url={}",url);
-              jp = qywxSuiteApiService.uploadAttachment(qwDTO.getThirdCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());
           }else {
               // 群发上传
               jp = qywxSuiteApiService.uploadMedia(qwDTO.getThirdCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());