Merge remote-tracking branch 'origin/master'

lishuai

2023-12-26 70577a6d6cf2bded29e71dcad11a0c2605193d20

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java

@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -170,4 +171,12 @@
    @ExcelColumn(name="被访问人所属组织id")
    private String idcardDecode;

    // 条件查询参数
    @ApiModelProperty(value = "姓名/手机号")
    @TableField(exist = false)
    private String keyWords;

    @ApiModelProperty(value = "公司/部门名称")
    @TableField(exist = false)
    private String companyName;
}