From 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 10:04:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 1338d4f..164c3c5 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
@@ -3,7 +3,6 @@
import com.zt.common.dao.BaseDao;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
-import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import org.apache.ibatis.annotations.Mapper;
@@ -23,11 +22,18 @@
List<XhProductModel> getList(Map<String, Object> params);
- Integer getNo(Long pid);
+ Integer getNo(Long pid, String productType);
List<XhProductModel> getProductList();
- List<ProductImg> getProduct(Long productId);
+ List<ProductImg> getProduct(Long productId, Long parentId);
- String getDefaultImg();
+ List<XhProductModel> getTaskProductList();
+ XhProductModel getById(Long id);
+
+ List<XhProductModel> getByShipId(Long shipId);
+
+ List<XhProductModel> getProductTree(Long shipId);
+
+ void deleteByShipId(Long shipId);
}
--
Gitblit v1.9.1