yogiman:
a refine

Signed-off-by: yogiman <xuyuji9000@163.com>
Merge branch 'master' of git@github.com:TuanFou/TuanFou.git
Merge branch 'master' of git@github.com:TuanFou/TuanFou.git
Merge branch 'master' of git@github.com:TuanFou/TuanFou.git
yogiman：
method public List<MerchantGroupFilmOrderInfo> getGroupFilmOrderInfos(int merchantId)
Get merchant's groupFilm's Basic Order info

Signed-off-by: yogiman <xuyuji9000@163.com>
Merge branch 'master' of git@github.com:TuanFou/TuanFou.git

Conflicts:
	src/com/tuanfou/dao/MerchantDao.java
	src/com/tuanfou/test/MerchantDaoTest.java

Signed-off-by: yogiman <xuyuji9000@163.com>