Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-10-15 08eefab8f0b04018dc62928ec2191bcae9d3e7d0

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

@@ -28,7 +28,7 @@
    @ExcelProperty(value = "电话", index = 4)
    private String phone;

    @ExcelProperty(value = "签到时间", index = 0)
    @ExcelProperty(value = "签到时间（未签到就是报名时间）", index = 0)
    private Date createAt;

    @ExcelProperty(value = "人群标签", index = 3)