Merge branch 'master' of ssh://10.10.100.21/source/search-parent into dev

mall-search/src/main/resources/config/application-test.properties

@@ -1,5 +1,5 @@
-datasource.url=jdbc:mysql://192.168.253.6:3306/mall_test_dev?characterEncoding=utf-8&useSSL=false
-datasource.username=root
+datasource.url=jdbc:mysql://192.168.100.3:3306/mall_test_dev?characterEncoding=utf-8&useSSL=false
+datasource.username=sa
 datasource.password=select111***
 datasource.driverClassName=com.mysql.jdbc.Driver
 datasource.initialSize=1