Merge remote-tracking branch 'remotes/origin/dev_resi_export' into dev

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

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

@@ -597,6 +597,19 @@ public class IcResiUserController implements ResultDataResolver {
         return new Result();
     }
 
+    /**
+     * @param formDTO
+     * @Description 查询个人数据
+     * @author zxc
+     * @date 2021/11/3 9:21 上午
+     */
+    @PostMapping("persondata")
+    public Result<PersonDataResultDTO> personData(@LoginUser TokenDto tokenDto, @RequestBody PersonDataFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO, PersonDataFormDTO.PersonDataForm.class);
+        return new Result<PersonDataResultDTO>().ok(icResiUserService.personData(formDTO));
+    }
+
     /**
      * @param formDTO
      * @param tokenDto