Merge branch 'master' of http://git.quantgroup.cn/QA/qa-deploy-utils

db-utils/config/db_config

-database_list=mall xyqb cash_loan_flow clotho contract display dujiangyan financial_system financial_system_api fund_manage gyxd merchant notify offline payment_center qinqiong quartz redpacket risk_control silk_road spider_center traffic_distribution user_credit xyqb_app xyqb_btzt xyqb_user
+database_list=mall xyqb cash_loan_flow clotho contract display dujiangyan financial_system financial_system_api fund_manage gyxd mall_settlement merchant notify offline payment_center qinqiong quartz redpacket risk_control silk_road spider_center traffic_distribution user_credit xyqb_app xyqb_btzt xyqb_user
 source_db_pwd=Uiwb@o^fR&nHOa5t
\ No newline at end of file

db-utils/db_gen_config.sh

@@ -124,7 +124,7 @@ elif [[  $database_name = 'xyqb_user'  ]]; then
 	port='3313'
 elif [[ $database_name = 'merchant' ]]; then
 	# 商户
-	sys_table_list='authority product_nature role role_authority role_supplier user'
+	sys_table_list='authority product_nature role role_authority role_supplier role_user user'
 	port='3314'
 elif [[ $database_name = 'xyqb_btzt' ]]; then
 	# 白条直投
@@ -150,11 +150,16 @@ elif [[ $database_name = 'traffic_distribution' ]]; then
 	sys_table_list='merchant merchant_carousel merchant_credit merchant_detail merchant_section merchant_sort ppdai_exclude_channel t_module t_module_role t_role t_user t_user_role traffic_channel_banner_ids traffic_channel_ids traffic_channel_sort traffic_infos'
 	source_db_host='192.168.3.36'
 	port='3313'
- elif [[ $database_name = 'notify' ]]; then
+elif [[ $database_name = 'notify' ]]; then
 	# 通知
  	sys_table_list='merchant merchant_config'
 	source_db_host='192.168.4.6'
  	port='7306'
+elif [[ $database_name = 'mall_settlement' ]]; then
+	# 通知
+ 	sys_table_list='role role_user user'
+	source_db_host='192.168.4.253'
+ 	port='3315'
 fi
 
 echo "port is $port"