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

gdg

2021-02-02 aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b

 src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java

@@ -73,7 +73,7 @@

    private void initUserSelectList() {
        logger.info("WarehouseStockMngController initUserSelectList start");
        this.setUserSelectList(this.sysUserService.getSysUserList(null, null, null, null, null));
        this.setUserSelectList(this.sysUserService.getSysUserList(null, null, null, null, null,null,null));
    }
    public void setUserSelectList(List<SysUser> userSelectList) {
        this.userSelectList = userSelectList;