Conflicts: src/com/engine/organization/service/FieldDefinedService.java src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
Merge pull request !74 from reset/feature/cl
Merge pull request !38 from dxfeng/feature/dxf
Merge pull request !31 from reset/feature/cl
Merge pull request !13 from dxfeng/feature/dxf
Merge pull request !11 from dxfeng/feature/dxf
Merge pull request !10 from reset/feature/cl