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

Pu Zhibing

8 天以前 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/WxCpProperties.java

@@ -29,8 +29,15 @@
     */
    private String agentSecret;


    private String addressSecret;

    /**
     *
     */
    private String authorizeState;

    private String token;

    private String encodingAESKey;
}