Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-31 dde29a93461a81940dbef9a65c60fa2690f2097e

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java

@@ -109,4 +109,11 @@
     * @return 创建结果
     */
    R addActivityApplets(ComPbActivityDTO comPbActivityDTO);

    /**
     * 根据党员活动id查询活动下报名人员
     * @param activityId    党员活动id
     * @return  活动下报名人员
     */
    R getTaskPbActivityPeopleList(Long activityId);
}