Merge branch 'master' of http://git.meloinfo.com/wangwei/interface_platform

src/main/java/com/hr/controller/DemoController.java

@@ -18,7 +18,7 @@ import com.yy.basedevelop.common.data.BaseReturnDto;
 
 
 import com.yy.basedevelop.common.http.config.RedisService;
-import com.yy.basedevelop.common.http.config.ThreadLocalContext;
+
 import com.yy.basedevelop.common.util.DictUtil;
 import com.yy.basedevelop.common.util.ExcelUtil;
 import com.yy.basedevelop.common.util.HttpClientUtils;