fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

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