Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-05 2d338a0e7480330ecb78e6d5471c2f47867b0a80

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/model/WeixinProperties.java

@@ -13,8 +13,7 @@
 */
@ToString
@Component
@ConfigurationProperties(prefix = "wx.conf")
@Data
@ConfigurationProperties(prefix = "payment.wx")
public class WeixinProperties {
    /**
     * 默认开启