Merge remote-tracking branch 'origin/master'

xyc

2024-11-05 5f77609d5118737e135c6ca3add168ad01aa52b6

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java

@@ -25,7 +25,7 @@

    Integer getNo(Long pid, String productType);

    List<XhProductModel> getProductList();
    List<XhProductModel> getProductList(Long shipId, Integer type);

    List<ProductImg> getProduct(Long productId, Long parentId);

@@ -45,4 +45,8 @@
    Long[] getByPid(Long id);

    List<ProductDto> getProductByShip(Long shipId);

    List<XhProductModel> getProductListByShip(Long productId, int level1, int level2);

    List<XhProductModel> getProductListAll();
}