Merge remote-tracking branch 'origin/master'

doum

21 小时以前 ed8eeb20e85871b44b5a0d51b96f5efa43d14d56

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

@@ -210,4 +210,6 @@
     */
    SaleReportResponse saleReport(SaleReportRequest request, String shopId);


    String setGoodsPrice(Shop shop);
}