~jiangyouyao/beauty-erp.git

jiangyouyao / beauty-erp

forked from beauty-erp

summary
commits
tree
docs
forks
compare

fix conflect

Helius

2021-11-17 792a502dd95cadccbef8121673e6b5059a2c3550

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

}

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

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

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

			}