From 9ef61aec5e8b218db9d60941ef3ad576a927338b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 26 四月 2024 11:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 911c047..96dd7ce 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
@@ -55,11 +55,11 @@
         return TreeUtils.build(productList);
     }
 
-    public Integer getNo(Long pid) {
-        if (baseDao.getNo(pid) == null) {
+    public Integer getNo(Long pid, String productType) {
+        if (baseDao.getNo(pid, productType) == null) {
             return 0;
         }
-        return baseDao.getNo(pid);
+        return baseDao.getNo(pid,productType);
     }
 
     public List<XhProductModel> getProductList() {

--
Gitblit v1.9.1