Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

gongchunyi

23 小时以前 6a939851b9561fea92ec29c59fa9e47ab9467ff7

 basic-server/src/main/resources/mapper/StandardTreeMapper.xml

@@ -330,6 +330,7 @@
            ${ew.customSqlSegment}
        </if>
    </select>

    <select id="getIfsByOver" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
        select * from (<include refid="getIfsOrder"/>
        <where>
@@ -343,6 +344,7 @@
        </if>
        order by send_time desc
    </select>

    <select id="getIfsByOverList" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
        select * from (<include refid="getIfsOrder"/>
            <where>