Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 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;