fix bug

fix bug

Signed-off-by: nslogspf <oak_javaspf@163.com>
fix bug

fix bug

Signed-off-by: nslogspf <oak_javaspf@163.com>
Merge branch 'master' of https://github.com/lygn128/WanXiang

Signed-off-by: nslogspf <oak_javaspf@163.com>

Conflicts:
	LPBookViewController.xib
	LPCommodityCell.xib
	LYGEveryPhenomenonStreetViewController.xib
fix bug

fix bug

Signed-off-by: nslogspf <oak_javaspf@163.com>
Merge branch 'master' of https://github.com/lygn128/WanXiang

Signed-off-by: nslogspf <oak_javaspf@163.com>

Conflicts:
	LFSortContentsViewController.xib
	LPAffirmViewController.xib
	LPPartyBuyViewController.xib