Merge branch 'local_20221024' into huacheng_test

yanghui

2022-11-01 d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e

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

@@ -40,6 +40,6 @@
    @ExcelProperty(value = "签到地点", index = 2)
    private String position;

    @ExcelProperty(value = "签到次数", index = 3)
    @ExcelProperty(value = "参加次数序号", index = 3)
    private Integer times;
}