Merge branch 'feature/社群' into 'developer'

Feature/社群

See merge request !673

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java

@@ -637,6 +637,8 @@ public class HmLinkController {
         }
         if (qdto.getLinkType() != null) {
             jsonObject.put("linkType", qdto.getLinkType());
+        }else {
+            jsonObject.put("linkType", "1,2");
         }
         if (qdto.getStartDate() != null) {
             jsonObject.put("startTime", DateUtil.datetimeToString19(qdto.getStartDate()));

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/MemberChatVO.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+public class MemberChatVO implements Serializable {
+
+    private String memberName;
+    private String phone;
+    private String memberImage;
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public String getMemberImage() {
+        return memberImage;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public void setMemberImage(String memberImage) {
+        this.memberImage = memberImage;
+    }
+}