Merge branch 'master' of zhoujie/commons into master

commons-profile-core/src/main/java/com/yihu/ehr/profile/family/ResourceCells.java

@@ -200,7 +200,8 @@ public class ResourceCells {
                        PATIENT_AGE,
                        PATIENT_SEX,
                        PATIENT_ID,
                        DEPT_CODE
                        DEPT_CODE,
                        CREATE_DATE
                ));
            case File:
                return new ArrayList<>(Arrays.asList(
@@ -209,7 +210,8 @@ public class ResourceCells {
                        ORG_AREA,
                        EVENT_TYPE,
                        EVENT_NO,
                        EVENT_DATE
                        EVENT_DATE,
                        CREATE_DATE
                ));
            case Link:
                return new ArrayList<>(Arrays.asList(