Merge branch 'master' of git@github.com:CRM2014/cf.git into Csrr
Merge branch 'master' of git@github.com:CRM2014/cf.git into Csrr
Signed-off-by: 陈释è? <11301119@bjtu.edu.cn>
Signed-off-by: lovewindy <1063652094@qq.com>
Merge remote-tracking branch 'origin/windy'
Signed-off-by: SabrinaWang <673458347@qq.com>
Merge remote-tracking branch 'origin/SabrinaWang'

Conflicts:
	WebContent/view/customer/basic/list.jsp
Merge commit 'c118a1f86729e86d09a74aa7b2ed3987d055ef1c'
Merge branch 'qiyu'