和大家在一起的更新
Merge branch 'master

Conflicts:
	src/main/java/businesslogicservice/CommodityBLService.java