Merge remote-tracking branch 'origin/master'

xyc

2024-10-12 9ccfd089b6cac9f8ba0cb7cadfee01857a715f0d

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

@@ -42,4 +42,6 @@
    void deleteByPid(Long id);

    Long[] getByPid(Long id);

    void getProductByShip(Long shipId);
}