Merge branch 'refs/heads/master' into xin

xin

2025-09-17 6d31d535d737ed26c4d9d61cd4e0b5483cb9b0ba

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

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

    List<OrderReturnReason> findAll(@Param("criteria") OrderReturnReasonQueryCriteria criteria);

    List<OrderReturnReason> miniQuery();
}