Merge remote-tracking branch 'origin/master'

doum

2 天以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

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