Merge branch 'dev' of http://git.qmth.com.cn/themis/backend-service into dev

1111

themis-backend/src/main/java/com/qmth/themis/backend/api/TBOrgController.java

@@ -87,7 +87,7 @@ public class TBOrgController {
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
     @Transactional
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    public Result enable(@ApiJsonObject(name = "enableOrg", value = {
+    public Result enableOrg(@ApiJsonObject(name = "enableOrg", value = {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "机构id"),
             @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "停用/启用")
     }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> user) {

themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java

@@ -640,7 +640,7 @@ public class TBUserController {
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
     @Transactional
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
-    public Result enable(@ApiJsonObject(name = "enableUser", value = {
+    public Result enableUser(@ApiJsonObject(name = "enableUser", value = {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "用户id"),
             @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "停用/启用")
     }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> user) {