Merge remote-tracking branch 'origin/master'

doum

7 天以前 0ad75ffcfc4c581ef54de705fae48b44803ed2a5

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

@@ -659,6 +659,7 @@
        vo.setCreateTime(shopInfo.getCreateTime());
        vo.setAliAccount(shopInfo.getAliAccount());
        vo.setAliName(shopInfo.getAliName());
        vo.setDepositAmount(shopInfo.getDepositAmount());

        // 拼接图片前缀
        String imgPrefix = "";