Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

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

@@ -20,5 +20,5 @@

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

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