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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,9 +1,10 @@
package com.panzhihua.common.model.vos.community.easyPhoto;

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.util.Date;

import com.alibaba.excel.annotation.ExcelProperty;

import lombok.Data;

@Data
public class ExportEasyPhotoVO {
@@ -16,11 +17,9 @@
    @ExcelProperty("发生地点")
    private String happenAddr;
    @ExcelProperty("事件类型")
    private String photoType="其他";
    private String photoType;
    @ExcelProperty("联系电话")
    private String phone;
    @ExcelProperty("处理人名字")
    private String handlerName;
    @ExcelProperty("创建时间")
    private Date createAt;
}