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

jyy

2021-01-16 522f32b832e47a1e0cb01b0b495d16ada34366a6

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsCategoryServiceImpl.java

@@ -90,6 +90,9 @@
         }
       }
   }
	
	

   @Override
   public List<ShoppingGoodsCategory> findChildNodesByName(ShoppingGoodsCategory shoppingGoodsCategory) {
      return shoppingGoodsCategoryDao.selectChildNodesByName(shoppingGoodsCategory);
   }
}