Merge remote-tracking branch 'origin/master'

rk

12 小时以前 b53ce008646cc62e0a0f10f4743fb6a73a6ee8bb

 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);
}