Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

Dev oracle sherlock

See merge request root/atms!119

atms-api/src/main/java/pwc/taxtech/atms/controller/RoleController.java

@@ -92,7 +92,7 @@ public class RoleController {
     @ApiOperation(value = "删除角色下用户")
     @RequestMapping(value = "removeUserRole", method = RequestMethod.POST)
     public @ResponseBody Boolean removeUserRole(@RequestParam("userID") String userId,
-            @RequestBody List<String> roleIdList, @RequestParam("serviceTypeId") String serviceTypeId) {
+            @RequestBody List<String> roleIdList, @RequestParam("serviceTypeID") String serviceTypeId) {
         roleService.removeUserRole(userId, roleIdList, serviceTypeId);
         return true;
     }
@@ -142,7 +142,7 @@ public class RoleController {
 
     @ApiOperation(value = "Update a role info")
     @RequestMapping(value = "update", method = RequestMethod.PUT)
-    public void updateRole(@RequestBody UpdateRoleInfo updateRole, @RequestParam("roleId") String roleId) {
+    public void updateRole(@RequestBody UpdateRoleInfo updateRole, @RequestParam("roleID") String roleId) {
 
         roleService.updateRole(updateRole, roleId);
     }
@@ -157,7 +157,7 @@ public class RoleController {
 
     @ApiOperation(value = "Need to check mapping between user and role, if yes not allow delete role")
     @RequestMapping(value = "checkReferenceforRole", method = RequestMethod.GET)
-    public Boolean checkExistReference(@RequestParam("roleId") String roleId) {
+    public Boolean checkExistReference(@RequestParam("roleID") String roleId) {
 
         return roleService.checkUserRole(roleId);
     }

atms-api/src/main/java/pwc/taxtech/atms/dto/ServiceTypeDto.java

@@ -8,7 +8,7 @@ import java.util.List;
  * @see PwC.Tax.Tech.Atms.Application.Dto\TaxAdminDto\ServiceTypeDto.cs
  */
 public class ServiceTypeDto {
-    @JsonProperty("ID")
+//    @JsonProperty("ID")
     private String id;
     private String name;
 

atms-api/src/main/java/pwc/taxtech/atms/dto/role/RoleDtoBase.java

@@ -3,7 +3,7 @@ package pwc.taxtech.atms.dto.role;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class RoleDtoBase {
-    @JsonProperty("ID")
+//    @JsonProperty("ID")
     private String id;
     private String name;
     private String description;