fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

 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);
  
}