Merge branch 'refs/heads/master' into xin

xin

2025-09-12 8849a8a7032079df128f0c530fd4368cfbc75d81

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

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

    List<OrderOperationLog> findAll(@Param("criteria") OrderOperationLogQueryCriteria criteria);

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