Merge branch 'test' into 'yuyue_dev'

罗元桥

2021-08-30 eda58e0e6d4abdd2b060e28867d103045845aa69

 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,7 +17,7 @@
    @ExcelProperty("发生地点")
    private String happenAddr;
    @ExcelProperty("事件类型")
    private String photoType="其他";
    private String photoType = "其他";
    @ExcelProperty("联系电话")
    private String phone;
    @ExcelProperty("处理人名字")