Merge branch 'feature-content2' of git.gicdev.com:haoban3.0/haoban-manage3.0 into feature-content2

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/ChatContentDTO.java

@@ -10,6 +10,11 @@ public class ChatContentDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 标题
+     */
+    private String title;
+
+    /**
      * 封面url
      */
     private String img;
@@ -35,6 +40,14 @@ public class ChatContentDTO implements Serializable {
      */
     private Integer urlChangeFlag;
 
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
     public String getImg() {
         return img;
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatPlanController.java

@@ -316,6 +316,7 @@ public class GroupChatPlanController {
             List<ChatContentDTO> contentDTOList = JSONArray.parseArray(content, ChatContentDTO.class);
             materials = contentDTOList.stream().map(x -> {
                 MaterialDTO materialDTO = new MaterialDTO();
+                materialDTO.setMaterialTitle(x.getTitle());
                 materialDTO.setMaterialType(x.getType());
                 materialDTO.setMaterialContent(x.getContent());
                 materialDTO.setImgUrl(x.getImg());