Merge remote-tracking branch 'origin/master'

czt

3 天以前 dfd2060bdcc0de929b4770a6a4a580c17bd72104

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java

@@ -78,7 +78,7 @@
        }else {
            conf.setUpdateBy(ContextUtil.getLoginUserName());
            conf.setUpdateTime(new Date());
            depotConfMapper.updateById(conf);
            depotConfMapper.update(conf, new UpdateWrapper<DepotConf>().eq("depot_id", conf.getDepotId()));
        }
        flushConfCache(conf.getCompanyId());
    }