Merge remote-tracking branch 'origin/master'

xyc

2024-10-28 b02c7eb73aabc8531b6e52b02fc15489f0441b52

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

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

    List<ProductDto> getProductByShip(Long shipId);

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