Merge branch 'feature/columnLabel' into 'master'

feat:[1004957]H5本书服务优化-栏目增加标签

See merge request rays/pcloud-book!1358

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

@@ -48,4 +48,8 @@ public class ResourcePageColumn extends BaseEntity {
      * 创建人
      */
     private Long createUser;
+    /**
+     * 标签图标
+     */
+    private String labelIcon;
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourceColumnAndServeVO.java

@@ -64,6 +64,10 @@ public class ResourceColumnAndServeVO extends BaseDto{
      * 图片位图片
      */
     private String logoUrl;
+    /**
+     * 标签图标
+     */
+    private String labelIcon;
 
     @ApiModelProperty("栏目标识")
     private String columnMarker;

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/UpdateResourceColumnVO.java

@@ -62,4 +62,8 @@ public class UpdateResourceColumnVO {
      * 资源列表
      */
     private List<ResourcePageItemVO> itemVOList;
+    /**
+     * 标签图标
+     */
+    private String labelIcon;
 }

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

@@ -14,6 +14,7 @@
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+        <result property="labelIcon" column="label_icon" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="ResourceColumnAndServe" type="com.pcloud.book.group.vo.ResourceColumnAndServeVO">
@@ -25,12 +26,13 @@
         <result property="columnSeq" column="column_seq" jdbcType="INTEGER"/>
         <result property="showCount" column="show_count" jdbcType="INTEGER"/>
         <result property="showMore" column="show_more" jdbcType="BOOLEAN"/>
+        <result property="labelIcon" column="label_icon" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
     <select id="getById" resultMap="ResourcePageColumnMap">
         select
-          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more,show_count, create_time
+          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more,show_count, create_time, label_icon
         from book.resource_page_column
         where id = #{id}
     </select>
@@ -38,9 +40,9 @@
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into book.resource_page_column(resource_page_id, column_type, column_name, column_format, column_seq,
-         show_more, show_count, create_time, update_time, create_user)
+         show_more, show_count, create_time, update_time, create_user, label_icon)
         values (#{resourcePageId}, #{columnType}, #{columnName}, #{columnFormat}, #{columnSeq},
-        #{showMore}, #{showCount}, now(), now(), #{createUser})
+        #{showMore}, #{showCount}, now(), now(), #{createUser}, #{labelIcon})
     </insert>
 
     <!--通过主键修改数据-->
@@ -65,6 +67,7 @@
             <if test="showMore != null">
                 show_more = #{showMore},
             </if>
+                label_icon = #{labelIcon},
                 update_time = now(),
         </set>
         where id = #{id}
@@ -92,7 +95,8 @@
             column_format,
             column_seq,
             show_count,
-            show_more
+            show_more,
+            label_icon
         FROM
             resource_page_column
         WHERE