Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2024-03-28 1a2258c4eca2e7514b6096004fa1c3e0036b402b

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml

@@ -6,6 +6,9 @@
        from mom_eam_stream t1
        left join sys_user t2 on t2.id = t1.create_by
        where 1=1
        <if test="num != null and num != ''">
            and t1.num like concat('%',#{num},'%')
        </if>
        <choose>
            <when test="areaId != null and areaId != ''">
                and t2.area_id = #{areaId}