Merge remote-tracking branch 'origin/master'

rentaiming

2024-06-21 f8f263f9149586e9694559a79a8a6f74128b144a

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java

@@ -20,7 +20,7 @@
 */
public interface IPaylogService extends IService<Paylog> {

    R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderID,String openId,
    R<Map<String, Object>> getPayInfo(Integer uid, Integer type,  String orderID,String openId,
                                             HttpServletRequest request);