From 068c446765a12420291f2ce7646a1aa7e7ca0ff5 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 15 Jun 2022 11:41:44 +0800
Subject: [PATCH] solve conflict

---
 src/com/engine/organization/web/FieldDefinedController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java
index 04668eb8..552a6717 100644
--- a/src/com/engine/organization/web/FieldDefinedController.java
+++ b/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);