Merge branch 'hemenkou_dev' into dev

101captain

2022-03-14 0965590521cd58e6fcc8d2ac97f4fa6b01e3e67e

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

@@ -18,9 +18,9 @@
    private String option;
    @ExcelProperty(value = "参与人数百分比", index = 2)
    private BigDecimal tag;
    @ExcelProperty(value = "选择该选项人数", index = 3)
    @ExcelProperty(value = "该选项选择总次数", index = 3)
    private Integer count;
    @ExcelProperty(value = "该题目参与人数", index = 4)
    @ExcelProperty(value = "该题目选择总次数", index = 4)
    private Integer allCount;

}