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

jyy

2021-01-22 f6d898060ce3ab0bbca1924fad724858d4adc296

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

}