Merge remote-tracking branch 'origin/master'

k94314517

2024-03-21 68ae0e6a2dc077d8b85187ee3dbee4b87a6c9b90

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.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;
@@ -58,6 +59,9 @@
    @ApiModelProperty(value = "角色编码（关联door_role),多个英文逗号隔开")
    @ExcelColumn(name="角色编码（关联door_role)")
    private String roleId;
    @ApiModelProperty(value = "可使用门禁编码集合，多个英文逗号隔开")
    @TableField(exist = false)
    private String doorIds;


}