Merge remote-tracking branch 'origin/master'

doum

15 小时以前 7b223c4dfdc960a6172bac87e47ab1b86b90ba1a

 server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java

@@ -210,7 +210,7 @@
     * @param shopId
     * @return
     */
    SaleReportResponse saleReport(SaleReportRequest request, String shopId);
    SaleReportResponse saleReport(SaleReportRequest request, Integer shopId);


    String setGoodsPrice(Shop shop);