Merge branch 'fixbug/1024267' into 'master'

bug: [1024267] 【生产环境】【平台端】【技能配置】每周权益和长期权益先选编辑端的群，再选普通群，会导致普通群消失

See merge request rays/pcloud-book!803

pcloud-service-book/src/main/java/com/pcloud/book/skill/dto/GroupActivity4AppletDTO.java

@@ -82,4 +82,7 @@ public class GroupActivity4AppletDTO implements Serializable {
 
     @ApiModelProperty("群链接")
     private String groupLink;
+
+    @ApiModelProperty("服务类型；GROUP、NEWS、PLAN")
+    private String serveType;
 }

pcloud-service-book/src/main/resources/mapper/skill/PcloudGroupActivityDao.xml

@@ -285,7 +285,8 @@
         a.first_classify AS firstClassify,
         a.second_classify AS secondClassify,
         a.grade_label_id AS gradeLabelId,
-        a.subject_label_id AS subjectLabelId
+        a.subject_label_id AS subjectLabelId,
+        'GROUP' as serveType
         FROM
         book_group_classify c
         LEFT JOIN pcloud_group_activity a ON a.book_group_classify_id = c.id
@@ -319,7 +320,8 @@
         c.price AS price,
         d.related_book_group_id relatedBookGroupId,
         a.group_type as groupType,
-        a.group_extLink groupLink
+        a.group_extLink groupLink,
+        'GROUP' as serveType
         FROM
         pcloud_group_activity a
         left JOIN book_group_classify c ON a.book_group_classify_id = c.id AND c.is_delete = 0