From 1ac9d6d25f32148354e46d11b814c306f475ee0d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 17:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java
index 5d8ea1a..9803c2f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java
@@ -84,6 +84,7 @@
@PostMapping("/page")
public R page(@RequestBody ComEventPageRequestVO comEventPageRequestVO) {
ComEventVO comEventVO = CopyUtil.copyProperties(comEventPageRequestVO, ComEventVO.class);
+ comEventPageRequestVO.setCreateBy(getUserId());
return comEventService.page(comEventVO, comEventVO.getPageNo(), comEventVO.getPageSize());
}
@@ -119,7 +120,7 @@
@ApiImplicitParam(name = "specterId", value = "专家ID", required = true, dataType = "Long"),
})
@PutMapping("/accept/Request")
- public R acceptRequest(@RequestParam("id") Long id, @RequestParam("specterId") Long specterId) {
+ public R acceptRequest( Long id, Long specterId) {
return comEventService.acceptRequest(id, specterId);
}
--
Gitblit v1.7.1