Merge remote-tracking branch 'origin/master'

rk

9 小时以前 55642c818f14bf8cf52c98e6858014bd8dc3d3a7

 server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java

@@ -555,7 +555,7 @@
        // 拼接图片前缀
        String imgPrefix = "";
        try {
            imgPrefix = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.RESOURCE_PATH).getCode()
            imgPrefix = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                    + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.DRIVER_FILES).getCode();
        } catch (Exception e) {
            // 未配置时忽略