From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/controller/TaskCampusReportingEventController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskCampusReportingEventController.java b/src/main/java/org/springblade/modules/task/controller/TaskCampusReportingEventController.java
index c603806..38a5722 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskCampusReportingEventController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskCampusReportingEventController.java
@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.task.dto.TaskCampusReportingEventDTO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.task.entity.TaskCampusReportingEventEntity;
@@ -88,8 +89,8 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入taskCampusReportingEvent")
- public R save(@Valid @RequestBody TaskCampusReportingEventEntity taskCampusReportingEvent) {
- return R.status(taskCampusReportingEventService.save(taskCampusReportingEvent));
+ public R save(@Valid @RequestBody TaskCampusReportingEventDTO taskCampusReportingEvent) {
+ return R.status(taskCampusReportingEventService.saveCampusReporting(taskCampusReportingEvent));
}
/**
@@ -98,8 +99,8 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入taskCampusReportingEvent")
- public R update(@Valid @RequestBody TaskCampusReportingEventEntity taskCampusReportingEvent) {
- return R.status(taskCampusReportingEventService.updateById(taskCampusReportingEvent));
+ public R update(@Valid @RequestBody TaskCampusReportingEventDTO taskCampusReportingEvent) {
+ return R.status(taskCampusReportingEventService.updateCampusReporting(taskCampusReportingEvent));
}
/**
--
Gitblit v1.9.3