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

jyy

2021-01-16 522f32b832e47a1e0cb01b0b495d16ada34366a6

 zq-erp/src/main/java/com/matrix/system/hive/dao/ShoppingGoodsCategoryDao.java

@@ -35,4 +35,6 @@

   public int batchInsert(@Param("list")List<ShoppingGoodsCategory> shoppingGoodsCategoryList);

   List<ShoppingGoodsCategory> selectChildNodesByName(@Param("record") ShoppingGoodsCategory shoppingGoodsCategory);

}