Merge remote-tracking branch 'origin/master'

jiangping

2024-01-31 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa

 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;