Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-09 9576bebcacea938771f6f5b51d958e6a4ac59df6

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

@@ -75,7 +75,7 @@
    private String mainRelatives;

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

    @ExcelProperty(value = "列管原因及类型", index = 19)
    private String rehabReasonAndType;