Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding


 Conflicts:

	src/main/resources/mapper/yunding/YdOrderDao.xml