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

huanghongfa

2021-08-10 5513e69c82a82eb6be786d5cb8e23b81bffc8636

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java

@@ -74,7 +74,7 @@
    private String guarDianPhone;

    @ExcelProperty(value = "与患者关系", index = 18)
    private String patientRelation;
    private Integer patientRelation;

    @ExcelProperty(value = "目前诊断", index = 19)
    private String diagnose;