Merge pull request #8 from qatang/dev

Dev
Merge pull request #10 from qatang/dev

Dev
Merge pull request #12 from qatang/dev

cms.properties
Merge pull request #13 from qatang/dev

Dev
Merge pull request #14 from qatang/dev

Dev
Merge pull request #15 from qatang/master

12.19
Merge pull request #16 from qatang/dev

1219
Merge pull request #1 from JSHgithub/dev

Merge pull request #67 from chirowong/master
test
将 qatang/dev 覆盖到 JSHgithub/master
删除 lecai json 包
Merge pull request #73 from JSHgithub/master

delete lecai json
Merge branch 'dev' of https://github.com/qatang/cms into qatang-dev
Merge branch 'qatang-dev'
Merge remote-tracking branch 'remotes/origin/master'
默认角色接口
默认角色接口
Merge pull request #6 from likunpeng06/master

角色管理
merge
merge