Merge remote-tracking branch 'origin/master'

value

2024-05-15 bce822c1cb336db7dad14e7dbc12f5a8a0fd656b

 inspect-server/src/main/resources/mapper/InsProductMapper.xml

@@ -47,7 +47,7 @@
        where io.id = #{orderId}
    </select>
    <select id="selectUserById" resultType="java.util.Map">
        select name,company,phone,address from user where id = #{userId}
        select name,company,phone,address,name_en from user where id = #{userId}
    </select>
    <select id="getProductAndResult" resultType="com.yuanchu.mom.dto.ProductResultDto2">
        select ip.id,ip.inspection_item,ip.inspection_item_subclass,ip.laboratory,ip.unit,ipr.equip_value,io.entrust_code,ipr.update_time,ip.ins_result,u.name updateUserName