test new branch

Signed-off-by: yogiman <xuyuji9000@163.com>
get back,test down
1.修改GroupFilmDetailedInfo.java中的字段名（field）适应前台和数据库的命名
adsfasdf

Signed-off-by: yogiman <xuyuji9000@163.com>
Merge branch 'DATEFormat'
Merge branch 'master' of git@github.com:TuanFou/TuanFou.git
未完成的date格式修改

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