Merge remote-tracking branch 'origin/master'

sgj

2026-01-05 7b973b3b9b723f48c54f2c0c5083886573224541

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

@@ -32,7 +32,7 @@
     */
    @DataProvider
    public List<DepotConf> getConfList() {
        return depotConfService.getConfList(null, ContextUtil.subDeptId(null));
        return depotConfService.getConfListByUserType();
    }

    /**