Merge remote-tracking branch 'origin/master' into xin

xin

2025-07-14 b4d3224898d50b8f1e30b5c8083a520743927282

 oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnOperationLogMapper.java

@@ -19,4 +19,6 @@
    IPage<OrderReturnOperationLog> findAll(@Param("criteria") OrderReturnOperationLogQueryCriteria criteria, Page<Object> page);

    List<OrderReturnOperationLog> findAll(@Param("criteria") OrderReturnOperationLogQueryCriteria criteria);

    List<OrderReturnOperationLog> getByReturnNum(String returnNum);
}