Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

2026-05-20 34181dcf0e38d744b8af1917bb5b8b0180b9eae1

 src/main/resources/mapper/sales/SalesQuotationMapper.xml

@@ -20,4 +20,4 @@
            AND t1.status = #{salesQuotationDto.status}
        </if>
    </select>
</mapper>
</mapper>