Merge branch 'dev_partymember_bug' into dev_temp

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

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -87,6 +87,13 @@ public interface EpmetUserFeignClient {
 	@PostMapping("/epmetuser/staffrole/staffsinrole")
 	Result<List<GovStaffRoleResultDTO>> getStaffsInRole(@RequestBody StaffRoleFormDTO staffRoleFormDTO);
 
-	@PostMapping("/epmetuser/userrole/sgetresidentrole")
+	/**
+	 * 获取用户居民权限
+	 * @author zhaoqifeng
+	 * @date 2021/4/22 14:41 
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UserRoleResultDTO>
+	 */
+	@PostMapping("/epmetuser/userrole/getresidentrole")
 	Result<UserRoleResultDTO> getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO);
 }

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

@@ -145,6 +145,13 @@ public class UserRoleController {
 		return new Result<Boolean>().ok(userRoleService.selectIsPartyMemberByUserId(userId));
 	}
 
+	/**
+	 * 获取用户居民权限
+	 * @author zhaoqifeng
+	 * @date 2021/4/22 14:41
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UserRoleResultDTO>
+	 */
 	@PostMapping("getresidentrole")
 	public Result<UserRoleResultDTO> getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO) {
 		return new Result<UserRoleResultDTO>().ok(userRoleService.getUserResidentRole(formDTO.getCustomerId(), formDTO.getUserId()));