Merge branch 'mymaster' into 'master'

修改显示书名的bug

See merge request rays/pcloud-book!63

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java

@@ -167,6 +167,10 @@ public class BookGroupBizImpl implements BookGroupBiz {
         bookGroup.setBookId(bookId);
         bookGroup.setChannelId(channelId);
         bookGroup.setCreateUser(adviserId);
+        Boolean isShowBookName = bookGroupDao.getIsShowBookName(adviserId);
+        if (isShowBookName != null) {
+            bookGroup.setIsShowBookName(isShowBookName);
+        }
         if (addType != null && addType == 1) {
             GroupQrcodeVO groupQrcodeVO = null;
             if (sceneId != null) {

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

@@ -156,6 +156,7 @@
             create_user,
             create_time,
             update_time,
+            is_show_book_name,
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             #{bookId,jdbcType=BIGINT},
@@ -173,6 +174,7 @@
             #{createUser,jdbcType=BIGINT},
             NOW(),
             NOW(),
+            #{isShowBookName,jdbcType=BOOLEAN},
         </trim>
     </insert>