fix conflect

Helius

2021-11-17 792a502dd95cadccbef8121673e6b5059a2c3550

 zq-erp/src/main/java/com/matrix/system/hive/service/ShoppingGoodsCategoryService.java

@@ -60,6 +60,6 @@
   public ShoppingGoodsCategory  findById(Long id);

      

   List<ShoppingGoodsCategory> findChildNodesByName(ShoppingGoodsCategory shoppingGoodsCategory);
  
}