Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

wuzeyu

2024-12-30 dd6e29aba4f614f236cf60aca4aa972a51a8dfb5

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java

@@ -333,9 +333,9 @@
        }

        Integer rows = intakeControllerSv.deleteTrampController(id);
        if (rows == 0) {
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
        }
//        if (rows == 0) {
//            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
//        }
        return BaseResponseUtils.buildSuccess(true);
    }