Merge branch 'master' of E:\自己的\MyProjects\MyShop with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/hzjxy/myshop/entity/Article.java
Merge remote-tracking branch 'origin/master'
林春蕾--封装实体
林春蕾--封装实体
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/hzjxy/myshop/entity/GoodsUnit.java
Merge remote-tracking branch 'origin/master'