Merge remote-tracking branch 'origin/master'

mitao

2024-05-31 5740c7c1f04e4ebe8925d2c8e490bc235ba1c453

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/alipay/util/PayDemoActivity.java

@@ -7,7 +7,8 @@
import com.alipay.api.domain.AlipayTradeAppPayModel;
import com.alipay.api.request.AlipayTradeAppPayRequest;
import com.alipay.api.response.AlipayTradeAppPayResponse;
import com.alipay.config.AlipayConfig;
import com.ruoyi.order.util.alipay.config.AlipayConfig;


import java.io.UnsupportedEncodingException;
import java.util.HashMap;