Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-29 d2542a6123fa6834e01ed3af23c7ba0a02696bc6

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java

@@ -24,13 +24,10 @@
    @Value("${wx.appletsAppSecret}")
    private String wxAppletsAppSecret;

    @Value("{wx.officialAccountAppSecret}")
    private String officialAccountAppSecret;

    @Value("${wx.appid}")
//    @Value("${wx.appid}")
    private String webAppId;

    @Value("${wx.appSecret}")
//    @Value("${wx.appSecret}")
    private String webAppSecret;