Merge remote-tracking branch 'origin/master'

nidapeng

2024-03-08 41c983292fdd3a4291245940cecb462b839a9e62

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

@@ -57,7 +57,7 @@

    @ApiModelProperty(value = "审批人类型 0被访人 1指定人员 2部门主管")
    @ExcelColumn(name="审批人类型 0被访人 1指定人员 2部门主管")
    private String memberType;
    private Integer memberType;

    @ApiModelProperty(value = "等级", example = "1")
    @ExcelColumn(name="等级")