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

liurunyu

2024-08-28 8d2b573ced32e6ca6fab7c1dc45e1fa108030ba1

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java

@@ -72,11 +72,11 @@
            if (res.itemTotal != null && res.itemTotal > 0) {
                return BaseResponseUtils.buildSuccess(res);
            } else {
                return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage());
                return BaseResponseUtils.buildSuccess(ProjectResultCode.NO_RECORDS.getMessage());
            }
            //return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取开卡记录异常", e);
            log.error("获取控制器记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }