Merge remote-tracking branch 'origin/rb' into rb

zj

2024-08-21 98ab2fc7accdfa1747b37de77c2fd7a0c0721f65

 src/main/java/com/nq/service/IPayService.java

@@ -18,7 +18,7 @@

  ServerResponse juhenewpayNotify(HttpServletRequest paramHttpServletRequest) throws UnsupportedEncodingException;

  ServerResponse flyPay(String paramString1, String paramString2, String paramString3, HttpServletRequest paramHttpServletRequest);
  ServerResponse flyPay(Integer paramString1, String paramString2, String paramString3, HttpServletRequest paramHttpServletRequest);
  
  ServerResponse flyNotify(HttpServletRequest paramHttpServletRequest) throws IOException;