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

无关风月

2025-08-13 983a116ee7ac71f921aa64fdf71197655c8b4aa0

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java

@@ -294,8 +294,8 @@
        dataMap.put("trans_amt", money+"");
        Map<String, String> wx_data = new LinkedHashMap<String, String>(); // 使用LinkedHashMap保持顺序
        // todo
        dataMap.put("sub_appid", wechatPayConfig.getAppId());
        dataMap.put("sub_openid", data.getOpenId());
        wx_data.put("sub_appid", wechatPayConfig.getAppId());
        wx_data.put("sub_openid", data.getOpenId());

        dataMap.put("wx_data", wx_data);