Merge remote-tracking branch 'origin/master'

jiangping

2024-01-05 cb6874174975a370cb60f1557704c9d49a05f9e6

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

@@ -79,7 +79,7 @@
    @ExcelColumn(name="类型 0劳务访客 1普通访客  2内部人员")
    private Integer type;

    @ApiModelProperty(value = "访客名称")
    @ApiModelProperty(value = "访客名称/内部人员")
    @ExcelColumn(name="访客名称")
    private String name;