Merge branch 'dev_zj' into dev

zss

2025-03-06 218c85f5128b95cedcc20127c60d1915bb1f7bc6

 cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java

@@ -90,8 +90,8 @@
     * @return
     */
    @ApiOperation(value = "设备核查计划删除")
    @DeleteMapping("/delQualitySupervise")
    public Result delQualitySupervise(Integer planId){
    @DeleteMapping("/delDeviceExaminePlan")
    public Result delDeviceExaminePlan(Integer planId){
        return Result.success(deviceExaminePlanService.removeById(planId));
    }