合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/AssembleController.java

@@ -63,7 +63,7 @@ public class AssembleController extends BaseController {
 		//获取首页banner数据
 		List<ToBanner> toBannerList = bannerService.viewAllBannerImg(1);
 		//获取消息总数接口
-		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userId);
+		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userElement.getUserVerifyId());
 		
 		//组装数据
 		indexMap.put("menuList",menuList);

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -241,7 +241,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 //                        String codeUrl= imageServiceI.getImageUrl(inputStream);
 
                         TdImages tdImages= new TdImages();
-                        tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId()+"&codeState=1");
+                        tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
                         tdImages.setUuid(tpActivity.getId());
                         tdImages.setType("activityCode");
                         tdImages.setCreateUser(userElement.getId());