Merge branch 'grey' into testBLK

@@ -170,7 +170,7 @@ var g=new common.grid({
 			}
 		},
 		{
-			display:"<label class='red'>厂家颜色、尺码、销售价、条码必填</label>",render:function(item){
+			display:"<label class='red'>厂家颜色、尺码、销售价 必填</label>",render:function(item){
 				if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){
 					g.__gsm[item.__index]=item.goodsSizeList.length;
 				}