Merge remote-tracking branch 'origin/master'

xyc

2024-10-23 48dcf2c7f01de5078f6a7f94dbc59400100e9ab6

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

@@ -1,6 +1,7 @@
package com.zt.life.modules.mainPart.basicInfo.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.mainPart.basicInfo.dto.ProductDto;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import org.apache.ibatis.annotations.Mapper;
@@ -42,4 +43,6 @@
    void deleteByPid(Long id);

    Long[] getByPid(Long id);

    List<ProductDto> getProductByShip(Long shipId);
}