Tool类添加若干宏定义
Merge branch 'dev'