Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-10-25 cc3bbf14c5fde619c23e5502c8583889e94deacc

 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java

@@ -183,7 +183,7 @@

    List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model);

    void goodsOrderSettlement(String orderId);
    void goodsOrderSettlement(String memberId);

    void autoCloseOrder();
}