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

jyy

2021-01-16 9253517ff8a10e2df7924fdf6e0b737544d1a859

 zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java

@@ -605,7 +605,7 @@
    /**
     * 微信商户号
     */
    public static final String WECHARPAY_APPID = "wecharPayAppid";
    public static final String WECHARPAY_MCHID = "wecharPayMchId";
    /**
     * 支付秘钥
     */