Merge branch 'api' into hive2.0

jyy

2021-01-26 ec0c71cc88407098e0c088dbf1e44cddf856b8f8

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