fix：修复没有分支错误

10.Paul需求-JSON贝格ES导入本地ES/MinderES/BeigeOracle_MinderES/App.config

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
@@ -48,7 +48,13 @@
   </runtime>
   <connectionStrings>
     <add name="HJBeigeContext" providerName="Oracle.ManagedDataAccess.Client" connectionString="User Id=bigdata_admin;Password=bigdata_admin;Data Source=BEIGE_ORCL" />
+<<<<<<< master
     <add name="MinderESDatabase" connectionString="host=minder;port=9200;defaultIndex=palas_test;requesttimeout=30000" />
+=======
+
+    <add name="MinderESDatabase" connectionString="host=minder;port=9200;defaultIndex=palasitems_v1;requesttimeout=30000" />
+    <!--<add name="MinderESDatabase" connectionString="host=minder;port=9200;defaultIndex=palas_test;requesttimeout=30000" />-->
+>>>>>>> local
     <add name="PalasV5Context" connectionString="server=minder;user id=palas;password=lapas;persistsecurityinfo=True;database=Palas_V5;Character Set=utf8" providerName="MySql.Data.MySqlClient" />
     <add name="PalasEntityContext" connectionString="server=minder;user id=palas;password=lapas;persistsecurityinfo=True;database=Palas_V5;Character Set=utf8" providerName="MySql.Data.MySqlClient" />
     </connectionStrings>

10.Paul需求-JSON贝格ES导入本地ES/MinderES/TaikorES_MinderES/App.config

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
@@ -45,7 +45,13 @@
   </runtime>
   <connectionStrings>
     <add name="ESDatabase" connectionString="host=mech.palaspom.com|tank.palaspom.com;port=19235;defaultIndex=palas" />
+<<<<<<< master
     <add name="MinderESDatabase" connectionString="host=minder;port=9200;defaultIndex=palas_test;requesttimeout=30000" />
+=======
+
+    <add name="MinderESDatabase" connectionString="host=minder;port=9200;defaultIndex=palasitems_v1;requesttimeout=30000" />
+    <!--<add name="MinderESDatabase" connectionString="host=minder;port=9200;defaultIndex=palas_test;requesttimeout=30000" />-->
+>>>>>>> local
     <add name="PalasV5Context" connectionString="server=minder;user id=palas;password=lapas;persistsecurityinfo=True;database=Palas_V5;Character Set=utf8" providerName="MySql.Data.MySqlClient" />
     <add name="PalasEntityContext" connectionString="server=minder;user id=palas;password=lapas;persistsecurityinfo=True;database=Palas_V5;Character Set=utf8" providerName="MySql.Data.MySqlClient" />
   </connectionStrings>