Merge branch 'feature-content4-3' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentMaterialController.java

@@ -353,6 +353,7 @@ public class ContentMaterialController {
         ContentMaterialDataVO dataVO = null;
         for (Long materialId : contentMaterialIdList) {
             dataVO = new ContentMaterialDataVO();
+            dataVO.setContentMaterialId(materialId);
             ContentMaterialLikeDTO likeDTO = likeMap.get(materialId);
             if (likeDTO != null) {
                 Long likeCount = likeDTO.getLikeCount();