Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss

sgj

8 天以前 22a4f2b58fa1baa233e621d1406df456b516b4b1

 fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java

@@ -48,6 +48,19 @@
    }

    /**
     *     depotPR#getDepotByUserType
     *
     * @return
     */

    @DataProvider
    public List<Depot> getDepotByUserType(String parentId) {
        if (StringUtils.isNotEmpty(parentId)) {
            return depotService.getDepotByUserType(parentId);
        }
        return depotService.getDepotByUserType(null);
    }
    /**
     * depotPR#saveOrUpdate
     *
     * @param data