Merge branch 'revert-d8ff3e4a' into 'master'

Revert "Merge branch 'feature/1003198' into 'master'"

See merge request rays/pcloud-book!813

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

@@ -284,10 +284,6 @@ public class BookGroupDTO extends BaseDto {
      */
     private String groupQrcodeLink;
 
-    private Integer groupQrcodePageNum;
-    private Integer groupQrcodeLocationId;
-    private String groupQrcodeRemark;
-
     public String getGroupQrcodeLink() {
         return groupQrcodeLink;
     }
@@ -763,30 +759,6 @@ public class BookGroupDTO extends BaseDto {
         this.friendGuideList = friendGuideList;
     }
 
-    public Integer getGroupQrcodePageNum() {
-        return groupQrcodePageNum;
-    }
-
-    public void setGroupQrcodePageNum(Integer groupQrcodePageNum) {
-        this.groupQrcodePageNum = groupQrcodePageNum;
-    }
-
-    public Integer getGroupQrcodeLocationId() {
-        return groupQrcodeLocationId;
-    }
-
-    public void setGroupQrcodeLocationId(Integer groupQrcodeLocationId) {
-        this.groupQrcodeLocationId = groupQrcodeLocationId;
-    }
-
-    public String getGroupQrcodeRemark() {
-        return groupQrcodeRemark;
-    }
-
-    public void setGroupQrcodeRemark(String groupQrcodeRemark) {
-        this.groupQrcodeRemark = groupQrcodeRemark;
-    }
-
     @Override
     public String toString() {
         return "BookGroupDTO{" +

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/BookGroup.java

@@ -172,14 +172,6 @@ public class BookGroup extends BaseEntity {
      */
     private Boolean openWeapp;
 
-    /**
-     * 二维码所在页
-     * add by pans  2020/7/10
-     */
-    private Integer groupQrcodePageNum;
-    private Integer groupQrcodeLocationId;
-    private String groupQrcodeRemark;
-
     public Long getRelatedBookGroupId() {
         return relatedBookGroupId;
     }
@@ -428,30 +420,6 @@ public class BookGroup extends BaseEntity {
         this.friendGuideList = friendGuideList;
     }
 
-    public Integer getGroupQrcodePageNum() {
-        return groupQrcodePageNum;
-    }
-
-    public void setGroupQrcodePageNum(Integer groupQrcodePageNum) {
-        this.groupQrcodePageNum = groupQrcodePageNum;
-    }
-
-    public Integer getGroupQrcodeLocationId() {
-        return groupQrcodeLocationId;
-    }
-
-    public void setGroupQrcodeLocationId(Integer groupQrcodeLocationId) {
-        this.groupQrcodeLocationId = groupQrcodeLocationId;
-    }
-
-    public String getGroupQrcodeRemark() {
-        return groupQrcodeRemark;
-    }
-
-    public void setGroupQrcodeRemark(String groupQrcodeRemark) {
-        this.groupQrcodeRemark = groupQrcodeRemark;
-    }
-
     @Override
     public String toString() {
         return "BookGroup{" +

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

@@ -33,8 +33,6 @@
         <result column="open_weapp" property="openWeapp" jdbcType="BOOLEAN"/>
         <result column="single_group" property="singleGroup" jdbcType="BOOLEAN"/>
         <result column="related_book_group_id" property="relatedBookGroupId" jdbcType="BIGINT"/>
-        <result column="group_qrcode_location_id" property="groupQrcodeLocationId" jdbcType="BIGINT"/>
-        <result column="group_qrcode_remark" property="groupQrcodeRemark" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="BookGroupDTO" type="com.pcloud.book.group.dto.BookGroupDTO">
@@ -73,9 +71,6 @@
         <result column="open_weapp" property="openWeapp" jdbcType="BOOLEAN"/>
         <result column="single_group" property="singleGroup" jdbcType="BOOLEAN"/>
         <result column="related_book_group_id" property="relatedBookGroupId" jdbcType="BIGINT"/>
-        <result column="group_qrcode_page_num" property="groupQrcodePageNum" jdbcType="INTEGER"/>
-        <result column="group_qrcode_location_id" property="groupQrcodeLocationId" jdbcType="BIGINT"/>
-        <result column="group_qrcode_remark" property="groupQrcodeRemark" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -84,7 +79,7 @@
         create_time,
         update_time, is_delete, is_show_book_name,join_group_type,add_friend_guide,customer_service_name,
         is_invite_group,book_group_cipher, last_push_update_time, is_some_update, agent_id, belong_special_agent,
-        short_book_name, open_weapp, single_group, related_book_group_id,group_qrcode_page_num,group_qrcode_location_id,group_qrcode_remark
+        short_book_name, open_weapp, single_group, related_book_group_id
     </sql>
 
     <select id="getById" resultMap="BaseResultMap" parameterType="java.lang.Long">
@@ -324,15 +319,6 @@
             <if test="singleGroup !=null">
                 single_group = #{singleGroup},
             </if>
-            <if test="groupQrcodePageNum !=null">
-                group_qrcode_page_num = #{groupQrcodePageNum},
-            </if>
-            <if test="groupQrcodeLocationId !=null">
-                group_qrcode_location_id = #{groupQrcodeLocationId},
-            </if>
-            <if test="groupQrcodeRemark !=null">
-                group_qrcode_remark = #{groupQrcodeRemark},
-            </if>
         </set>
         where id = #{id,jdbcType=BIGINT}
     </update>