Merge remote-tracking branch 'origin/master'

test-api/src/main/java/com/sooka/api_pagefile/db.txt

@@ -6,15 +6,15 @@ db3-自然资源厅-不动产
 
 db4-卫健委-献血
 
-db5-住建-自来水
+db5-住建-自来水-燃气
 
-db6-民政(市殡葬)
+db6-民政-市殡葬
 
 db7-市医药
 
 -- db8-市殡葬
 
-db9-市燃气
+-- db9-市燃气
 
 db10-市房地产
 

test-api/src/main/java/com/sooka/mapper/Guiji_Gas_Mapper2.java

@@ -5,7 +5,7 @@ import com.sooka.model.bo.*;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-@DS("db1")
+@DS("db5")
 public interface Guiji_Gas_Mapper2 {
 
     public void add_guiji_gas_Zenner_user_infor(Guiji_gas1_Zenner_user_infor_Bean bean);