solve conflict
Merge branch 'master' of https://github.com/shijingwang/python_tool.git
ETL Program
merger config
Merge branch 'master' of https://github.com/shijingwang/python_tool.git
commit data
fix check logic
merger setting
Merge branch 'master' of https://github.com/shijingwang/python_tool.git