Merge remote-tracking branch 'origin/master'

无关风月

2026-01-13 d98af68f2ea108254ec362ac2497fd619e6dd3eb

 ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml

@@ -464,7 +464,7 @@
            t1.instructions_use like concat('%',#{query.queryCondition},'%') or
            t1.ingredient like concat('%',#{query.queryCondition},'%') or
            t1.trait like concat('%',#{query.queryCondition},'%') or
            t1.indication like concat('%',#{query.queryCondition},'%') or
            t1.indication like concat('%',#{query.queryCondition},'%')
            )
        </if>
        <if test="query.goodsIds != null and query.goodsIds.size()>0">