Merge remote-tracking branch 'origin/master'

wente

2024-06-07 4bff52e938ae2c260fe54d32ef680908868bb27e

 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() {