Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/GoodsServiceImpl.java

@@ -288,9 +288,15 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 			if(Objects.nonNull(newGoods.getGoodsCategoryId())&&!newGoods.getGoodsCategoryId().equals(existsGood.getGoodsCategoryId())){
 				existsGood.setGoodsCategoryId(newGoods.getGoodsCategoryId());
 			}
+			if(Objects.nonNull(newGoods.getGoodsCategoryName())&&!newGoods.getGoodsCategoryName().equals(existsGood.getGoodsCategoryName())){
+				existsGood.setGoodsCategoryName(newGoods.getGoodsCategoryName());
+			}
 			if(Objects.nonNull(newGoods.getName())&&!newGoods.getName().equals(existsGood.getName())){
 				existsGood.setName(newGoods.getName());
 			}
+			if(Objects.nonNull(newGoods.getBrand())&&!newGoods.getBrand().equals(existsGood.getBrand())){
+				existsGood.setBrand(newGoods.getBrand());
+			}
 			if(Objects.nonNull(newGoods.getType())&&!newGoods.getType().equals(existsGood.getType())){
 				existsGood.setType(newGoods.getType());
 			}
@@ -315,6 +321,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.getDesc())&&!newGoods.getDesc().equals(existsGood.getDesc())){
+				existsGood.setDesc(newGoods.getDesc());
+			}
 			if(Objects.nonNull(newGoods.getClientShow())&&!newGoods.getClientShow().equals(existsGood.getClientShow())){
 				existsGood.setClientShow(newGoods.getClientShow());
 			}