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

huliguo

8 天以前 c897a68da55d63439826d37be3cb13c5c0f95a48

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

@@ -51,7 +51,7 @@
     * @param shopId
     * @return  Integer
     */
    Integer getMemberIngTotal(Long shopId);
    List<Integer> getMemberIngTotal(Long shopId);

    /**
     * @description  获取最近任务
@@ -61,6 +61,5 @@
     * @return  MemberTaskSimpleVo
     */
    MemberTaskSimpleVo getLastMemberTask(Long userId);


}