From 56e2dc02ca5f4cf38308f8a1389322639f89e99e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 16:01:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index b66f891..afb173f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -535,13 +535,14 @@
     @ApiOperation("新增投诉建议或问题留言")
     @PostMapping("addFeedBack")
     public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
+        sysUserFeedbackDTO.setCommunityId(null);
         return userService.addFeedback(sysUserFeedbackDTO);
     }
 
     @ApiOperation("查看自己的投诉建议或问题留言记录")
     @GetMapping("myFeedBack")
-    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
-        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
+    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type,@RequestParam("propertyId")Long propertyId){
+        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type,propertyId);
     }
 
 }

--
Gitblit v1.7.1