Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

liyong

2026-05-09 67fda7b2dfbfc9e6a8d8b9472499a67906d2bad1

 src/main/resources/mapper/production/ProductionOrderMapper.xml

@@ -129,6 +129,9 @@
                <if test="c.endTime != null">
                    and po.end_time &lt;= #{c.endTime}
                </if>
                <if test="c.workshopId != null">
                    and t7.id = #{c.workshopId}
                </if>
            </if>
        </where>
    </sql>