Merge branch 'feature/1004461-1' into 'master'

bug: [none] RAYS编辑端小优化-微信群作品增加作者id

See merge request rays/pcloud-book!1251

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

@@ -3122,6 +3122,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
                         bookGroupServe.setFromType(productDto.getProductTypeDto().getTypeName());
                     }
                     bookGroupServe.setIsSuper(isSuperMap.get(bookGroupServe.getServeId()));
+                    bookGroupServe.setMerchantId(productDto.getAuthor());
                 }
             }
             if (AppAndProductTypeEnum.APP.value.equals(bookGroupServe.getServeType())) {

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

@@ -68,4 +68,7 @@ public class BookGroupServe extends BaseEntity {
     private String typeCode;
 
     private Long bookId;
+
+    @ApiModelProperty("作者id")
+    private Long merchantId;
 }