Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

 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;