Commit ab05befc by guojuxing

Merge remote-tracking branch 'origin/developer' into developer

parents 163d9095 e3f319e2
......@@ -130,7 +130,7 @@ public class UnionEnterpriseController {
dto.setResourceList(response.getResult());
}
}
return RestResponse.success(list);
return RestResponse.success(result);
}
return RestResponse.success();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment