Merge pull request #1 from chishang/master

Auto merge by kpm server
Merge pull request #2 from chishang/master

Auto merge by kpm server
Merge pull request #3 from chishang/master

Auto merge by kpm server
Merge pull request #4 from chishang/master

Auto merge by kpm server
Merge pull request #5 from chishang/master

Auto merge by kpm server
Merge pull request #6 from chishang/master

Auto merge by kpm server
Merge pull request #7 from chishang/master

Auto merge by kpm server
Merge pull request #8 from chishang/master

1.2 内置规则非空过滤
Merge pull request #9 from chishang/master

Auto merge by kpm server
Merge pull request #10 from chishang/master

Auto merge by kpm server
Merge pull request #1 from kissygalleryteam/master

test