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/task/controller/TaskLabelReportingEventController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java b/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
index e75b3bd..7fc3e08 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
@@ -63,9 +63,9 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入taskLabelReportingEvent")
- public R<TaskLabelReportingEventVO> detail(TaskLabelReportingEventEntity taskLabelReportingEvent) {
+ public R detail(TaskLabelReportingEventEntity taskLabelReportingEvent) {
TaskLabelReportingEventEntity detail = taskLabelReportingEventService.getOne(Condition.getQueryWrapper(taskLabelReportingEvent));
- return R.data(TaskLabelReportingEventWrapper.build(). entityVO(detail));
+ return R.data(detail);
}
/**
* 打金店报事 分页
@@ -141,4 +141,16 @@
ExcelUtil.export(response, "交易登记" + DateUtil.time(), "交易登记表", list, TaskLabelReportingEventExcel.class);
}
+
+ /**
+ * 二手交易报事 详情
+ */
+ @GetMapping("/getDetail")
+ @ApiOperationSupport(order = 9)
+ @ApiOperation(value = "详情", notes = "传入taskLabelReportingEvent")
+ public R getDetail(TaskLabelReportingEventVO taskLabelReportingEvent) {
+ TaskLabelReportingEventVO detail = taskLabelReportingEventService.getDetail(taskLabelReportingEvent);
+ return R.data(detail);
+ }
+
}
--
Gitblit v1.9.3