Merge remote-tracking branch 'origin/master'

Pu Zhibing

9 天以前 e998c057be6d077dcec169ab4cb34f4755932601

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/tencent/common/HttpsRequest.java

@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.shunfeng.tencent.common;

import com.stylefeng.guns.modular.account.util.Util;
import com.stylefeng.guns.modular.shunfeng.tencent.service.IServiceRequest;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;