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

xin

2025-07-11 3caa0b05a620aa7714de0d63c804e43aa6486c9b

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

@@ -19,4 +19,8 @@
    IPage<OrderReturn> findAll(@Param("criteria") OrderReturnQueryCriteria criteria, Page<Object> page);

    List<OrderReturn> findAll(@Param("criteria") OrderReturnQueryCriteria criteria);

    OrderReturn getByReturnNum(String returnNum);

    void updatePayStatus(String returnNum, String status, String time);
}