Merge remote-tracking branch 'origin/master'

jiangping

2024-02-04 6e41324f84f0cf70871ca05292c5420bdcaaa98c

 server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java

@@ -98,9 +98,11 @@

    @ApiModelProperty(value = "0 启用 1 禁用")
    private Integer status;

    @ApiModelProperty(value = "所属企业信息对")
    @TableField(exist = false)
    private Company company;

    @ApiModelProperty(value = "权限内企业编码集合")
    @TableField(exist = false)
    private List<Integer> companyIdList;