Merge branch 'api' into order_reform

Helius

2021-01-12 b8e2c0dee6ae4520a2e0e783b416825d872c8f9e

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