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

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

@@ -691,7 +691,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		JSONResponse jp = null;
 		if(material.getMaterialType() == 2 || material.getMaterialType() == 4 || material.getMaterialType() == 5){
 			Date wxLastTime = material.getWxLastUploadTime();
-			String maerialId = material.getMaterialId();
+			String maerialId = material.getMediaId();
 			if(DateUtil.addDay(wxLastTime, 3).getTime() < System.currentTimeMillis()){
 				maerialId = materialApiService.reUpdalodMetail(materialId);
 			}