Merge remote-tracking branch 'origin/feat-1001733' into feat-1001733

pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/BookGroupDTO.java

 package com.pcloud.book.group.dto;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.pcloud.book.book.dto.BookDto;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 社群书群二维码DTO
  * @author PENG
@@ -120,6 +121,11 @@ public class BookGroupDTO implements Serializable {
 
     private String url;
 
+    /**
+     * 进群方式：1群二维码，2客服机器人
+     */
+    private Integer joinGroupType;
+
     public String getUrl() {
         return url;
     }
@@ -290,6 +296,22 @@ public class BookGroupDTO implements Serializable {
         this.bookInfo = bookInfo;
     }
 
+    public Boolean getDelete() {
+        return isDelete;
+    }
+
+    public void setDelete(Boolean delete) {
+        isDelete = delete;
+    }
+
+    public Integer getJoinGroupType() {
+        return joinGroupType;
+    }
+
+    public void setJoinGroupType(Integer joinGroupType) {
+        this.joinGroupType = joinGroupType;
+    }
+
     @Override
     public String toString() {
         return "BookGroupDTO{" +
@@ -313,6 +335,8 @@ public class BookGroupDTO implements Serializable {
                 ", updateTime=" + updateTime +
                 ", isDelete=" + isDelete +
                 ", bookInfo=" + bookInfo +
-                "} " + super.toString();
+                ", url='" + url + '\'' +
+                ", joinGroupType=" + joinGroupType +
+                '}';
     }
 }
\ No newline at end of file