Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-02 c67297af61ab9d897adae96f7e199c72c16d764b

 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;