Merge remote-tracking branch 'origin/master'

xyc

2024-08-16 33246bb56e05b273944ec1cc03a58dc112e48848

 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,9 +22,20 @@
    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);

    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);
}