Merge remote-tracking branch 'origin/master'

doum

11 小时以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java

@@ -342,6 +342,7 @@

        String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.OSS, Constants.MEMBER_FILE).getCode();
        for (Integral model : result.getRecords()) {
            model.setStrObjType(Constants.IntegralObjType.getName(model.getObjType()));
            if (StringUtils.isNotBlank(model.getImgurl())) {
                model.setImgurl(path + model.getImgurl());
            }