Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

5 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

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

@@ -62,11 +62,4 @@
     */
    MemberTaskSimpleVo getLastMemberTask(Long userId);

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