Merge branch 'zhuyajie' into 'master'

群人数合并

See merge request rays/pcloud-book!29

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

@@ -27,6 +27,10 @@ public class GroupQrcodeBaseDTO implements Serializable {
      * 分类
      */
     private String classify;
+    /**
+     * 群人数
+     */
+    private Integer userNumber;
 
     public String getBookName() {
         return bookName;
@@ -60,6 +64,14 @@ public class GroupQrcodeBaseDTO implements Serializable {
         this.classify = classify;
     }
 
+    public Integer getUserNumber() {
+        return userNumber;
+    }
+
+    public void setUserNumber(Integer userNumber) {
+        this.userNumber = userNumber;
+    }
+
     @Override
     public String toString() {
         return "GroupQrcodeBaseDTO{" +
@@ -67,6 +79,7 @@ public class GroupQrcodeBaseDTO implements Serializable {
                 ", groupName='" + groupName + '\'' +
                 ", bookName='" + bookName + '\'' +
                 ", classify='" + classify + '\'' +
+                ", userNumber=" + userNumber +
                 '}';
     }
 }

pcloud-service-book/src/main/resources/mapper/group/BookGroupClassify.Mapper.xml

@@ -590,10 +590,11 @@
         <result column="group_name" property="groupName" jdbcType="VARCHAR"/>
         <result column="book_name" property="bookName" jdbcType="VARCHAR"/>
         <result column="classify" property="classify" jdbcType="VARCHAR"/>
+        <result column="user_number" property="userNumber" jdbcType="BIGINT"/>
     </resultMap>
     <select id="listGroupQrcodeBaseInfo" resultMap="GroupQrcodeMap" parameterType="list">
         SELECT
-            weixin_group_id, group_name, book_name, c.classify
+            weixin_group_id, group_name, book_name, c.classify, q.user_number
         FROM
             book_group_qrcode q
         JOIN