Merge pull request #1 from shmilbin1570/master

增加Demo.class
ss
commit

co
Merge pull request #2 from hanchunliang/master

修改杨宗彬属性为2
不提交idea文件
不提交idea文件
不提交idea文件
Merge branch 'master' of https://github.com/One-Platform/example into One-Platform-master

Conflicts:
	showcase/src/main/java/Demo.java