Merge branch 'fix-zp1002614' into 'master'

1002614 搜索记录结果中返回channelId

See merge request rays/pcloud-book!612

pcloud-service-book/src/main/java/com/pcloud/book/book/vo/SearchBookVO.java

@@ -21,6 +21,9 @@ public class SearchBookVO {
     @ApiModelProperty("书id")
     private Long bookId;
 
+    @ApiModelProperty("频道id")
+    private Long channelId;
+
     @ApiModelProperty("书名")
     private String bookName;
 

pcloud-service-book/src/main/resources/mapper/cultivate/CultivateRecord.xml

@@ -118,7 +118,7 @@
     </select>
 
     <select id="getBookSearchRecord" parameterType="map" resultType="com.pcloud.book.book.vo.SearchBookVO">
-        select a.id,a.content,a.book_id bookId ,b.book_name bookName,a.agent_id agentId,c.SECOND_TEMPLET_ID secondTempletId,b.publish ,c.ADVISER_ID adviserId
+        select a.id,a.content,a.book_id bookId ,b.book_name bookName,a.agent_id agentId,c.SECOND_TEMPLET_ID secondTempletId,b.publish ,c.ADVISER_ID adviserId,c.channel_id channelId
         ,a.create_time createTime,b.author,b.COVER_IMG coverImg
         from search_record a,book b ,book_adviser c
         where a.book_id=b.book_id