合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpShopTypeServiceImpl.java

 				tpShop.eq("shop_type_id",id.toString());
 				List<TpShop> tpShopList=tpShopMapper.selectList(tpShop);
 				for (TpShop shop:tpShopList){
-					shop.setShopTypeId(null);
+					shop.setShopTypeId();
 					tpShopMapper.updateById(shop);
 				}
 				shopTypeMapper.deleteById(id.toString());