From 5f77609d5118737e135c6ca3add168ad01aa52b6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 05 十一月 2024 16:29:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
index 25ab7c6..226ca83 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java
@@ -25,7 +25,7 @@
Integer getNo(Long pid, String productType);
- List<XhProductModel> getProductList();
+ List<XhProductModel> getProductList(Long shipId, Integer type);
List<ProductImg> getProduct(Long productId, Long parentId);
@@ -45,4 +45,8 @@
Long[] getByPid(Long id);
List<ProductDto> getProductByShip(Long shipId);
+
+ List<XhProductModel> getProductListByShip(Long productId, int level1, int level2);
+
+ List<XhProductModel> getProductListAll();
}
--
Gitblit v1.9.1