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

gongchunyi

4 天以前 6a939851b9561fea92ec29c59fa9e47ab9467ff7

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

@@ -35,7 +35,7 @@
     */
    @ApiOperation("分页查询设备点检记录")
    @GetMapping("/getDeviceInspectionRecordByPage")
    public Result<IPage<DeviceInspectionRecord>> getDeviceInspectionRecordByPage(IPage page, DeviceInspectionRecordDto itemParameter) {
    public Result<IPage<DeviceInspectionRecord>> getDeviceInspectionRecordByPage(Page page, DeviceInspectionRecordDto itemParameter) {
        return deviceInspectionRecordService.getDeviceInspectionRecordByPage(page, itemParameter);
    }