合并最新兼容9#109

Open

ytx0574 wants to merge 8 commits intoEnjoySR:masterfrom

ytx0574:master

Commits on Jun 2, 2016

添加description描述转json

johnson
authored and
johnson
committed
添加7.1.1支持

Johnson
authored and
Johnson
committed
添加红色字体, 去除下标越界的bug

Johnson
authored and
Johnson
committed

Commits on Jun 3, 2016

添加UUID命令

johnson
authored and
johnson
committed

Commits on Jun 4, 2016

没得什么内容

johnson
authored and
johnson
committed

Commits on Jun 8, 2016

xx

johnson
authored and
johnson
committed
Merge branch 'master' of https://github.com/ytx0574/ESJsonFormat-Xcode

johnson
authored and
johnson
committed
修改float提示

johnson
authored and
johnson
committed