liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

solve conflict

This commit is contained in:
Chengliang 2022-06-15 11:41:44 +08:00
parent 032a363985
commit 068c446765
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/web/FieldDefinedController.java
View File

@ -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);