Merge remote-tracking branch 'origin/dev' into dev

mall-search/src/main/resources/config/application-dev.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://188.131.128.107:3306/mall_test_dev?characterEncoding=utf-8&useSSL=false
+datasource.username=sa
 datasource.password=select111***
 datasource.driverClassName=com.mysql.jdbc.Driver
 datasource.initialSize=1