ignore target
Merge branch '1.2.x' of https://github.com/txteam/tx-parent.git into
1.2.x

Conflicts:
	tx-components/tx-component-template/target/classes/META-INF/maven/com.tx/tx-component-template/pom.properties
	tx-components/tx-components-basicdata/target/classes/META-INF/maven/com.tx.config/tx-component-basicdata/pom.properties
xxx