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/ShopTaskService.java

@@ -35,7 +35,7 @@
    * @author jqs34
    * @date 2023/6/18 17:09
    */
    MgtBulletinBoardVo boardTaskTotal();
    MgtBulletinBoardVo boardTaskTotal(List<Long> userIds);

    /**
     * @description  员工端获取进行中商户任务数