jjj

Signed-off-by: wanui <wanui2003@163.com>
Merge branch 'master' of github.com:wanui/EasyQuickCommon

Conflicts:
	common/src/main/java/com/easyquick/common/net/HttpHelper.java