Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-24 a435bc86b7a2e069900c708c9ed1ea70716870e0

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java

File was renamed from ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java
@@ -1,4 +1,4 @@
package com.ruoyi.payment.wx.controller;
package com.ruoyi.payment.controller;

import com.fasterxml.jackson.core.type.TypeReference;
import com.ruoyi.common.core.domain.R;