From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java b/src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java
index 366fc5e..123cc1b 100644
--- a/src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java
+++ b/src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java
@@ -55,9 +55,9 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入policeAlarmRecords")
- public R<PoliceAlarmRecordsVO> detail(PoliceAlarmRecordsEntity policeAlarmRecords) {
+ public R detail(PoliceAlarmRecordsEntity policeAlarmRecords) {
PoliceAlarmRecordsEntity detail = policeAlarmRecordsService.getOne(Condition.getQueryWrapper(policeAlarmRecords));
- return R.data(PoliceAlarmRecordsWrapper.build().entityVO(detail));
+ return R.data(detail);
}
/**
* 报警记录 分页
@@ -88,7 +88,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入policeAlarmRecords")
public R save(@Valid @RequestBody PoliceAlarmRecordsEntity policeAlarmRecords) {
- return R.status(policeAlarmRecordsService.save(policeAlarmRecords));
+ return R.status(policeAlarmRecordsService.savePoliceAlarmRecordsEntity(policeAlarmRecords));
}
/**
--
Gitblit v1.9.3