Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -42,7 +42,7 @@ public interface EpmetUserFeignClient {
      * 查询工作人员的角色
      * @return
      */
-    @PostMapping("/epmetuser/staffrole/staffRoles")
+    @PostMapping("/epmetuser/staffrole/staffroles")
     Result<List<GovStaffRoleDTO>> getRolesOfStaff(StaffRoleFormDTO staffRoleFormDTO);
 }
 

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

@@ -35,7 +35,7 @@ public class StaffRoleController {
      * 根据工作人员查询工作人员具有的角色列表
      * @return
      */
-    @PostMapping("staffRoles")
+    @PostMapping("staffroles")
     public Result<List<GovStaffRoleDTO>> getRolesOfStaff(@RequestBody StaffRoleFormDTO staffRoleFormDTO) {
         ValidatorUtils.validateEntity(staffRoleFormDTO);
         String staffId = staffRoleFormDTO.getStaffId();