Merge pull request #33 from hopesfish/dev

Dev
Merge pull request #34 from hopesfish/dev

rule的测试用例
1.修改规则实体及controller
2.修改规则以通过测试
Merge pull request #32 from pengqin/dev

Dev