Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 ea744c63bf10f14fe5a51addf37083c384093e21

 modules/mainPart/src/main/resources/mapper/basicInfo/ParamDataDao.xml

@@ -51,4 +51,15 @@
          and a.ship_id = #{shipId}
    </select>

    <select id="getDeviceParams" resultType="com.zt.life.modules.mainPart.basicInfo.model.ParamData">
        SELECT a.*
        FROM param_data a
        inner join product_model b on b.id=a.product_id
        where a.is_delete = 0
          and b.is_delete = 0
          and b.product_type = '5'
        <if test="shipId!=null">
            and a.ship_id = #{shipId}
        </if>
    </select>
</mapper>