Merge remote-tracking branch 'origin/master'

jiangping

2023-12-22 22a00c47589ded6699a563690ee5545b73eaca01

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

@@ -55,7 +55,7 @@
    @ExcelColumn(name="用户编码")
    private Integer memberId;

    @ApiModelProperty(value = "角色编码（关联door_role)")
    @ApiModelProperty(value = "角色编码（关联door_role),多个英文逗号隔开")
    @ExcelColumn(name="角色编码（关联door_role)")
    private String roleId;