Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-16 522f32b832e47a1e0cb01b0b495d16ada34366a6

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