From 4bff52e938ae2c260fe54d32ef680908868bb27e Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 07 六月 2024 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index 96dd7ce..5bb44b6 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -68,7 +68,9 @@
     }
 
     public List<ProductImg> getProduct(Long productId) {
-        return baseDao.getProduct(productId);
+        XhProductModel model =this.get(productId);
+        Long parentId = model.getPid();
+        return baseDao.getProduct(productId,parentId);
     }
 
     public List<XhProductModel> getTaskProductList() {

--
Gitblit v1.9.1