Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

kfzslibrary/src/main/java/com/kfzs/libs/di/http/HttpModule.java

@@ -20,7 +20,9 @@ import retrofit2.converter.gson.GsonConverterFactory;
 @Module
 public class HttpModule {
 
-    public static final String BASE_URL = "http://10.8.240.165:7011/";
+//    public static final String BASE_URL = "http://10.8.240.165:7011/";
+    public static final String BASE_URL = "http://10.8.230.17:7011/";
+
     public static final int CONNECT_TIMEOUT = 15;
     public static final int READ_TIMEOUT = 15;