Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-20 241408b071cb1b43d9307ae9c75c82bb77b6faa7

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

@@ -31,8 +31,8 @@
    @ExcelProperty(value = "预约内容" ,index = 5)
    private String content;

    @ExcelProperty(value = "备注" ,index = 6)
    private String remark;
    @ExcelProperty(value = "备注人" ,index = 6)
    private String handleName;

    @ExcelProperty(value = "社区备注" ,index = 7)
    private String actRemark;