Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-07 0ab1b864458f36b294933112824b10b13770915e

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskService.java

@@ -36,8 +36,11 @@
    void createMemberTask(MerCreateMemberTaskDto merCreateMemberTaskDto);

    /**
     *
     * @description  会员任务跟进
     * @author  jqs
     * @date    2023/7/4 17:16
     * @param merFollowMemberTaskDto
     * @return  void
     */
    void followMemberTask(MerFollowMemberTaskDto merFollowMemberTaskDto);

@@ -58,4 +61,12 @@
     * @return  MemberTaskSimpleVo
     */
    MemberTaskSimpleVo getLastMemberTask(Long userId);

    /**
     * @description  员工端获取进行中任务数
     * @author  jqs
     * @param shopIds
     * @return  Integer
     */
    Integer getMembersIngTotal(List<Long> shopIds);
}