Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-05 454ee66716ec76821e78ab1f056f39fca6f29a71

Merge remote-tracking branch 'origin/master'

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

@@ -94,7 +94,7 @@

    @GetMapping("/home/list")
    @ApiOperation(value = "列表", notes = "列表", tags = {"小程序-个人中心-我的预约"})
    public TableDataInfo<TechnicianSubscribeVO> homelist(@ApiParam(value = "状态 0=待服务，1=已服务，2=已取消 4 已到期") @RequestParam Integer status) {
    public TableDataInfo<TechnicianSubscribeVO> homelist(@ApiParam(value = "状态 0=待服务，1=已服务，2=已取消 4 已到期") Integer status) {
        startPage();
        List<TechnicianSubscribeVO> list = technicianSubscribeService
                .getTechnicianSubscribeByUser(SecurityUtils.getUserId(), status);