Merge remote-tracking branch 'origin/master'

doum

昨天 04aa86aaad90ac02a4d167129ab3e530e9a9589c

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