Merge branch 'local_20221010' into huacheng_test

yanghui

2022-10-10 c60eea0ab4d74ab8f39a33f896e978dc591f1800

 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;