From 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 05 十二月 2024 09:40:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java | 9 ++++++++-
1 files changed, 8 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 57671ea..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
@@ -1,6 +1,7 @@
package com.zt.life.modules.mainPart.basicInfo.dao;
import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.mainPart.basicInfo.dto.ProductDto;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import org.apache.ibatis.annotations.Mapper;
@@ -24,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);
@@ -42,4 +43,10 @@
void deleteByPid(Long id);
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