Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 33a80f6b0585a320872477f85a50aa10ca1d20b1

 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;