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

Conflicts:
	src/com/tuanfou/test/GroupFilmDaoTest.java
Merge branch 'master' of git@github.com:TuanFou/TuanFou.git
yogiman：在GroupFilmDao中实现对set到list<string>的转化，并将之赋值给
detailedinfo

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

Conflicts:
	src/com/tuanfou/dto/GroupFilmDetailedInfo.java

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