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

huanghongfa

2021-07-05 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java

@@ -1,11 +1,11 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;


@@ -20,6 +20,7 @@
 * */
@Data
@TableName("event_visiting_tasks")
@EncryptDecryptClass
public class EventVisitingTasksDO implements Serializable {

    private static final long serialVersionUID = 1L;
@@ -64,6 +65,7 @@
    /**
     * 需走访人电话   列: visiter_tele
     */
    @EncryptDecryptField
    private String visiterTele;
    /**
     * 需走访人居住地址   列: visiter_address
@@ -201,5 +203,17 @@
     */
    private Integer outOrLocal;

    /**
     * 备注
     */
    private String remark;

    /**
     * 网格ID
     */
    private Long gridId;
    /**
     * 是否已经上传浪潮服务器市平台
     */
    private Boolean lcUpload;
}