solve conflict

src/com/engine/organization/web/FieldDefinedController.java

@@ -73,7 +73,7 @@ public class FieldDefinedController {
     @Path("/{moduleTypeEnum}/editTree")
     @Produces(MediaType.APPLICATION_JSON)
     public ReturnResult editTree(@Context HttpServletRequest request, @Context HttpServletResponse response,
-                                @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) {
+                                @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum,@RequestBody FieldTypeTreeParam fieldTypeTreeParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
             return getFieldDefinedWrapper(user).getTree(moduleTypeEnum);