Merge branch 'dev_personal_center' into dev_temp

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/controller/AdviceController.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.SubmitAdviceFormDTO;
+import com.epmet.dto.result.MyAdviceListResultDTO;
 import com.epmet.modules.advice.service.AdviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -48,7 +50,7 @@ public class AdviceController {
      * @Date 2020/11/5 13:26
      */
     @PostMapping("myadvicelist")
-    public Result getMyAdviceList(@RequestBody Map<String,Integer> map){
+    public Result<List<MyAdviceListResultDTO>> getMyAdviceList(@RequestBody Map<String,Integer> map){
         return adviceService.getMyAdviceList(map);
     }
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/AdviceService.java

@@ -2,11 +2,13 @@ package com.epmet.modules.advice.service;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.SubmitAdviceFormDTO;
+import com.epmet.dto.result.MyAdviceListResultDTO;
 
+import java.util.List;
 import java.util.Map;
 
 public interface AdviceService {
     Result submitAdvice(SubmitAdviceFormDTO dto);
 
-    Result getMyAdviceList(Map<String,Integer> map);
+    Result<List<MyAdviceListResultDTO>> getMyAdviceList(Map<String,Integer> map);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -410,7 +410,7 @@ public interface EpmetUserOpenFeignClient {
      * @Date 2020/11/11 10:35
      */
     @PostMapping("/epmetuser/useradvice/myadvicelist")
-    Result<MyAdviceListResultDTO> myAdviceList(@RequestBody Map<String,Integer> map);
+    Result<List<MyAdviceListResultDTO>> myAdviceList(@RequestBody Map<String,Integer> map);
 
     /**
      * @Description 个人中心-提交建议

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -279,7 +279,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result<MyAdviceListResultDTO> myAdviceList(Map<String, Integer> map) {
+    public Result<List<MyAdviceListResultDTO>> myAdviceList(Map<String, Integer> map) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "myAdviceList", map);
 
     }