Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 33a80f6b0585a320872477f85a50aa10ca1d20b1

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

@@ -22,7 +22,7 @@
public class ComActActEvaluateExcelVO {

    @ExcelProperty(value = "姓名", index = 1)
    private String nickName;
    private String name;

    @ExcelProperty(value = "身份", index = 2)
    private String identity;