Merge remote-tracking branch 'origin/master'

xyc

2024-10-12 9ccfd089b6cac9f8ba0cb7cadfee01857a715f0d

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java

@@ -413,4 +413,8 @@
    public Long[] getByPid(Long id) {
        return baseDao.getByPid(id);
    }

    public void exportDataExcel(Long shipId) {
        baseDao.getProductByShip(shipId);
    }
}