Merge branch 'master' of https://gitee.com/yuanchu_code/lims-management-system

XiaoRuby

2023-08-07 d8a687741273d121586b83745280c57f7e9d3297

 user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java

@@ -76,6 +76,9 @@
    @ApiModelProperty(value = "关联 角色id")
    private Integer roleId;

    @ApiModelProperty(value = "关联 企业id")
    private Integer enterpriseId;

    public User(String account, String name, String phone, String email, String info) {
        this.account = account;
        this.name = name;