fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java

@@ -72,6 +72,9 @@

      //小程序公司与域名对应关系拦截
      registry.addInterceptor(hostInterceptor).addPathPatterns("/**/wxapi/**")
            .addPathPatterns("/api/common/wxLogin/**")
            .addPathPatterns("/api/common/bindUser")
            .addPathPatterns("/api/user/xcxloginOut/**")
            .excludePathPatterns("/wxCommon/wxapi/wxpayCallback")
            .excludePathPatterns("/wxCommon/wxapi/rechargeCallBack");
   }