Merge branch 'api' into order_reform

Helius

2021-01-11 854d9d55a86b7076abc4f526e90001bd806d324c

 zq-erp/src/main/java/com/matrix/system/wechart/templateMsg/demo/MsgDemo.java

File was renamed from zq-erp/src/main/java/com/matrix/system/wechart/templateMsg/MsgDemo.java
@@ -1,4 +1,4 @@
package com.matrix.system.wechart.templateMsg;
package com.matrix.system.wechart.templateMsg.demo;

import com.alibaba.fastjson.JSONObject;
import com.matrix.component.tools.HttpClientUtil;
@@ -6,6 +6,7 @@
import com.matrix.system.hive.plugin.util.HttpUtils;
import com.matrix.system.shopXcx.api.WeChatGzhApiTools;
import com.matrix.system.shopXcx.bean.ShopAdvertisType;
import com.matrix.system.wechart.templateMsg.GzhTemplateMessagePojo;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.NameValuePair;