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

xin

2025-07-11 3caa0b05a620aa7714de0d63c804e43aa6486c9b

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

@@ -21,6 +21,8 @@

    List<Order> findAll(@Param("criteria") OrderQueryCriteria criteria);

    Long countAll(@Param("criteria") OrderQueryCriteria criteria);

    Order getByOrderNum(String orderNum);

    void updatePayStatus(String orderNum, String payState, String payMessage, String payTime);