Merge pull request #1 from bin1570/master

Add pom
增加Test
Merge pull request #2 from bin1570/mybranch

增加Test
增加user

增加user
Merge pull request #3 from bin1570/mybranch

增加user
增加Company类
增加Company

add company.java
Merge pull request #1 from shmilbin1570/master

add User
Merge pull request #4 from bin1570/mybranch

Mybranch
增加Employee类
add Employee

add Employee.java
Merge pull request #5 from bin1570/mybranch

Mybranch
delete Test

delete Test
Merge pull request #6 from bin1570/mybranch

delete Test
增加address,name属性

增加增加address,name属性
Merge pull request #7 from bin1570/mybranch

增加address,name属性
增加age
Merge pull request #8 from bin1570/mybranch

增加age
测试多人合并
Merge pull request #9 from One-Platform/master

测试多人合并