Merge branch 'fixbug/1024267' into 'master'

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

See merge request rays/pcloud-book!804

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

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

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

@@ -286,7 +286,9 @@
         a.second_classify AS secondClassify,
         a.grade_label_id AS gradeLabelId,
         a.subject_label_id AS subjectLabelId,
-        'GROUP' as serveType
+        'GROUP' as serveType,
+        '2' as groupType,
+        c.id as serveId
         FROM
         book_group_classify c
         LEFT JOIN pcloud_group_activity a ON a.book_group_classify_id = c.id