Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-11 7b09f233bde70508f6db7e08e983e9a2c4bb3e99

 sale-server/src/main/resources/mapper/SaleMaterialMapper.xml

@@ -2,11 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.SaleMaterialMapper">
    <select id="selectSaleDatil" resultType="com.yuanchu.mom.pojo.SaleMaterial">
        select id, name, specifications, unit, number, price, state, create_time, update_time, sale_id
        select id,
               name,
               specifications,
               unit,
               number,
               price,
               state,
               create_time,
               update_time,
               sale_id
        from mom_ocean.sale_material
        where state=1
        <if test="id!=null">
            and sale_id=#{id}
        </if>
    </select>
</mapper>