Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-02-05 1e1282e8ed0385a1bc88d82dbd9bbcf5d1d22ece

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

@@ -2,6 +2,7 @@

import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.app.dto.ShoppingGoodsListDto;
import com.matrix.system.app.vo.ShoppingGoodsDetailVo;
import com.matrix.system.app.vo.ShoppingGoodsListVo;
import com.matrix.system.hive.bean.ShoppingGoods;
import com.matrix.system.hive.plugin.util.BaseServices;
@@ -107,4 +108,6 @@
   List<ShoppingGoodsListVo> findShoppingGoodsListForApi(ShoppingGoodsListDto shoppingGoodsListDto);

   int findShoppingGoodsListTotalForApi(ShoppingGoodsListDto shoppingGoodsListDto);

   ShoppingGoodsDetailVo findApiShoppingGoodsDetailById(Long id);
}