df

BHZHGD/app/src/main/java/com/bjzc/bhzhgd/contans/Contans.java

@@ -11,9 +11,15 @@ public class Contans {
     public static String network_type_Intranet = "http://10.46.101.241:8100/";
     public static String network_type_extranet = "http://10.46.101.241:8100/";
 
+<<<<<<< Upstream, based on branch 'master' of git@192.168.1.24:hwf453/BHZHGD.git
 //    public static String IP = "http://10.46.101.241:8012/";
 //    public static String network_type_Intranet = "http://10.46.101.241:8012/";
 //    public static String network_type_extranet = "http://10.46.101.241:8012/";
+=======
+    public static String IP = "http://10.46.101.241:8100/";
+    public static String network_type_Intranet = "http://10.46.101.241:8100/";
+    public static String network_type_extranet = "http://10.46.101.241:8100/";
+>>>>>>> 00efd0c 配置调整
 
 //    public static String IP = "http://113.107.214.27:8092/";
 //    public static String network_type_Intranet = "http://192.168.254.1:8092/";