Merge remote-tracking branch 'origin/master'

xyc

2024-10-12 5cea5dff7f0d73c1b172252936b393fb390ab669

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