Merge branch 'dev_New_pro' into dev_平遥县盛达铸造厂

gongchunyi

2026-07-01 38f618f789b4062a51f1c8c608bb734d9e47b5ba

 src/main/resources/mapper/approve/ApprovalInstanceMapper.xml

@@ -29,6 +29,9 @@
        left join sys_user su on ai.create_user = su.user_id
        <where>
            deleted = 0
            <if test="ew.id != null">
                and ai.id = #{ew.id}
            </if>
            <if test="ew.instanceNo != null">
                and ai.instance_no like concat('%',#{ew.instanceNo},'%')
            </if>