Conflicts: src/com/engine/organization/service/FieldDefinedService.java src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
明细表按照上下级关系展示。
Merge pull request !78 from reset/feature/cl
Merge pull request !74 from reset/feature/cl
Merge pull request !42 from dxfeng/feature/dxf
Merge pull request !39 from dxfeng/feature/dxf
Merge pull request !38 from dxfeng/feature/dxf