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

Pu Zhibing

7 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

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

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


}