加入时间戳转字符串的方法
Merge branch 'master' of https://github.com/tangxin983/framework.git

Conflicts:
	common/src/main/java/tx/common/util/JodaTimeUtil.java