修改bug
Merge branch 'AndrewLee' into Dev
Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit/Base.lproj/Main.storyboard
	incommunit/Convenience/LYShop.m
	incommunit/Convenience/XIB/StoreslistTableViewCell.xib
数据中添加修改商品状态 和删除商品接口
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Base.lproj/Main.storyboard
	incommunit/Convenience/LYProductinformation.m
	incommunit/Convenience/LYconvenienceMain.m
	incommunit/Convenience/XIB/StoreslistTableViewCell.m
	incommunit/Convenience/XIB/StoreslistTableViewCell.xib
	incommunit/CustomControls/HLineLabel.m
	incommunit/PropertyManagement/LYAnnDetails.m