Merge branch 'master' into xin

xin

2025-08-29 728466c4924c04dc162811f34086855c51ec0878

 oying-system/src/main/java/com/oying/modules/sh/service/OrderOperationLogService.java

@@ -36,7 +36,7 @@
    /**
     * 创建
     */
    void create(OrderResponse response, OrderStatusEnum statusEnum);
    void create(OrderResponse response, OrderStatusEnum statusEnum, String cardName);

    /**
    * 编辑
@@ -58,5 +58,5 @@
    */
    void download(List<OrderOperationLog> all, HttpServletResponse response) throws IOException;

    List<OrderOperationLog> getByOrderNum(String orderNum);
    List<OrderOperationLog> getByOrderNum(String orderNum, String type);
}