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

云

2026-04-23 a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488

 src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java

@@ -14,6 +14,7 @@
import com.ruoyi.staff.utils.StyleYearUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -35,9 +36,9 @@
@RestController
@RequestMapping("/personalShift")
@Api(tags = "人员排班")
@AllArgsConstructor
public class PersonalShiftController {

    @Autowired
    private PersonalShiftService personalShiftService;

    @ApiOperation("人员排班")