Merge branch 'hylyasrs' of http://47.97.1.152:5880/r/zy-asrs into hylyasrs

whycq

2022-08-06 7d7090b098add475808ffdebebff8b4e2a3b98ff

 src/main/java/com/zy/system/entity/UserLogin.java

@@ -7,6 +7,7 @@
import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;

import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -23,6 +24,12 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 所属项目
     */
    @ApiModelProperty(value= "所属项目")
    @TableField("host_id")
    private Long hostId;
    /**
     * 员工
     */
@@ -48,6 +55,13 @@
        this.id = id;
    }

    public Long getHostId() {
        return hostId;
    }

    public void setHostId(Long hostId) {
        this.hostId = hostId;
    }
    public Long getUserId() {
        return userId;
    }