Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActRegistDAO.java

@@ -37,4 +37,12 @@
     * @return
     */
    List<ComActActRegistVO> listRegistRecord(@Param("id") Long id, @Param("userId") Long userId);

    /**
     * 获取总积分奖励
     * @param activityId
     * @param userId
     * @return
     */
    Integer selectTotalAwardWithRegist(@Param("activityId") Long activityId, @Param("userId") Long userId);
}