merge对底层排序的时候会将底层的列名表名换成别名了
Merge branch 'master' of https://github.com/tddl/tddl

Conflicts:
	tddl-executor/src/main/java/com/taobao/tddl/executor/function/aggregate/Avg.java
	tddl-qatest/src/test/resources/META-INF/services/com.taobao.tddl.atom.securety.TPasswordCoder