Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-10 a17335c7cddc86ffe70d423e7e6e7456b1d6c93a

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java

@@ -42,7 +42,7 @@
                              @ApiParam(value = "门店id") @RequestParam Long shopId) {
        startPage();
        List<TechnicianSubscribeVO> list = technicianSubscribeService
                .getTechnicianSubscribeByUserAndShop(SecurityUtils.getUserId(), shopId);
                .getTechnicianSubscribeByUserAndShop(null, shopId,status);
        return getDataTable(list);
    }