Merge remote-tracking branch 'origin/master'

doum

2026-01-20 e68e324f91d1a4eb2d4c5f07d27ca105a308bc0c

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