Merge branch 'feature-canvas' into 'developer'

社群

See merge request !2369

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

@@ -181,6 +181,9 @@ public class GroupChatPlanController {
                 MaterialDTO materialDTO = new MaterialDTO();
                 materialDTO.setMaterialType(x.getType());
                 materialDTO.setMaterialContent(x.getContent());
+                if(materialDTO.getMaterialType() == 4) {
+                    materialDTO.setLink(x.getContent());
+                }
                 materialDTO.setImgUrl(x.getImg());
                 return materialDTO;
             }).collect(Collectors.toList());