Merge remote-tracking branch 'origin/dev_ic_platform' into develop

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcResiUserController.java

@@ -10,7 +10,6 @@ import com.epmet.dataaggre.dto.epmetuser.form.IcResiUserPageFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.IcResiUserPageResultDTO;
 import com.epmet.dataaggre.service.epmetuser.IcResiUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -39,7 +38,7 @@ public class IcResiUserController {
      * @author yinzuomei
      * @date 2021/10/28 10:29 上午
      */
-    @PostMapping("listresi1")
+    //@PostMapping("listresi1")
     public Result<PageData<IcResiUserPageResultDTO>> queryListResi(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO){
         //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
         pageFormDTO.setCustomerId(tokenDto.getCustomerId());
@@ -47,7 +46,7 @@ public class IcResiUserController {
         return new Result<PageData<IcResiUserPageResultDTO>>().ok(icResiUserService.pageResi(pageFormDTO));
     }
 
-    @PostMapping("listresi")
+    //@PostMapping("listresi")
     public Result<PageData<Map<String,Object>>> queryListResi1(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO){
         //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
         pageFormDTO.setCustomerId(tokenDto.getCustomerId());
@@ -62,7 +61,7 @@ public class IcResiUserController {
      * @author yinzuomei
      * @date 2021/10/28 10:29 上午
      */
-    @PostMapping("detail")
+    //@PostMapping("detail")
     public Result queryIcResiDetail(@LoginUser TokenDto tokenDto,@RequestBody IcResiDetailFormDTO pageFormDTO){
         //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
         pageFormDTO.setCustomerId(tokenDto.getCustomerId());