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

jyy

2021-01-26 c62ecf74d20a4338632e454c4f270a739d3d69a1

 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";
    /**
     * 支付秘钥
     */