|  | @@ -209,6 +209,24 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 | 
	
		
			
				|  |  |  						}
 | 
	
		
			
				|  |  |  						continue;
 | 
	
		
			
				|  |  |  					}
 | 
	
		
			
				|  |  | +					if (columnValue.equals("clientShow")) {
 | 
	
		
			
				|  |  | +						for (YesOrNoEnum yesOrNoEnum : YesOrNoEnum.values()) {
 | 
	
		
			
				|  |  | +							if (yesOrNoEnum.getMsg().equals(row.get(s).toString())) {
 | 
	
		
			
				|  |  | +								objectMap.put(columnValue, yesOrNoEnum);
 | 
	
		
			
				|  |  | +								break;
 | 
	
		
			
				|  |  | +							}
 | 
	
		
			
				|  |  | +						}
 | 
	
		
			
				|  |  | +						continue;
 | 
	
		
			
				|  |  | +					}
 | 
	
		
			
				|  |  | +					if (columnValue.equals("stockWarning")) {
 | 
	
		
			
				|  |  | +						for (YesOrNoEnum yesOrNoEnum : YesOrNoEnum.values()) {
 | 
	
		
			
				|  |  | +							if (yesOrNoEnum.getMsg().equals(row.get(s).toString())) {
 | 
	
		
			
				|  |  | +								objectMap.put(columnValue, yesOrNoEnum);
 | 
	
		
			
				|  |  | +								break;
 | 
	
		
			
				|  |  | +							}
 | 
	
		
			
				|  |  | +						}
 | 
	
		
			
				|  |  | +						continue;
 | 
	
		
			
				|  |  | +					}
 | 
	
		
			
				|  |  |  					if (columnValue.equals("goodsCategoryName")) {
 | 
	
		
			
				|  |  |  						Integer integer = map.get(row.get(s));
 | 
	
		
			
				|  |  |  						if(integer == null){
 | 
	
	
		
			
				|  | @@ -290,6 +308,9 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 | 
	
		
			
				|  |  |  			if(Objects.nonNull(newGoods.getBrief())&&!newGoods.getBrief().equals(existsGood.getBrief())){
 | 
	
		
			
				|  |  |  				existsGood.setBrief(newGoods.getBrief());
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  | +			if(Objects.nonNull(newGoods.getClientShow())&&!newGoods.getClientShow().equals(existsGood.getClientShow())){
 | 
	
		
			
				|  |  | +				existsGood.setClientShow(newGoods.getClientShow());
 | 
	
		
			
				|  |  | +			}
 | 
	
		
			
				|  |  |  			if(Objects.nonNull(newGoods.getStockWarning())&&!newGoods.getStockWarning().equals(existsGood.getStockWarning())){
 | 
	
		
			
				|  |  |  				existsGood.setStockWarning(newGoods.getStockWarning());
 | 
	
		
			
				|  |  |  			}
 |