Merge remote-tracking branch 'origin/master' into master

gdg

2020-12-18 20e1449578ac0e558dc038e302001d3a6819ab2c

 src/main/java/com/nanometer/smartlab/entity/SysUser.java

@@ -32,6 +32,7 @@
    private Timestamp updateTime;
    private String containerCodeList;
    private String roleName;
    private String projectId;

    public String getId() {
        return id;
@@ -192,4 +193,13 @@
    public void setContainerCodeList(String containerCodeList) {
        this.containerCodeList = containerCodeList;
    }

    public String getProjectId() {
        return projectId;
    }

    public void setProjectId(String projectId) {
        this.projectId = projectId;
    }

}