From e4246536ec8218b0444667cbe457c0d3d6e67bd9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:43:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java |   17 ++++++++++++++++-
 1 files changed, 16 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 44c197e..25ab7c6 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;
@@ -26,8 +27,22 @@
 
     List<XhProductModel> getProductList();
 
-    List<ProductImg> getProduct(Long productId);
+    List<ProductImg> getProduct(Long productId, Long parentId);
 
     List<XhProductModel> getTaskProductList();
     XhProductModel getById(Long id);
+
+    List<XhProductModel> getByShipId(Long shipId);
+
+    List<XhProductModel> getProductTree(Long shipId);
+
+    void deleteByShipId(Long shipId);
+
+    List<XhProductModel> getProductPath(Long shipId);
+
+    void deleteByPid(Long id);
+
+    Long[] getByPid(Long id);
+
+    List<ProductDto> getProductByShip(Long shipId);
 }

--
Gitblit v1.9.1