Merge branch 'dev_thirdplatform' into dev

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java

@@ -55,7 +55,7 @@ public class ResiMineGridController {
 	 * @Description 单客户-获取用户最近访问网格
 	 * @Date 2020/8/3
 	 **/
-	@PostMapping("latestgridinfo")
+	@GetMapping("latestgridinfo")
 	public Result<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto token, @RequestBody LatestGridInfoFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO);
 		formDTO.setUserId(token.getUserId());

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

@@ -257,6 +257,6 @@ public interface EpmetUserOpenFeignClient {
      * @Description 单客户-获取用户最近访问网格
      * @Date 2020/8/3
      **/
-    @PostMapping(value = "epmetuser/gridlatest/latestgridinfo")
+    @GetMapping(value = "epmetuser/gridlatest/latestgridinfo")
     Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java

@@ -138,7 +138,7 @@ public class GridLatestController {
      * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
      * @Date 2020/8/3
      **/
-    @PostMapping("latestgridinfo")
+    @GetMapping("latestgridinfo")
     public Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){
         return new Result<LatestGridInfoResultDTO>().ok(gridLatestService.latestGridInfo(formDTO));
     }