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

云

2026-04-21 2683793796366a4b6361baf4a16e5c65c8dce068

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

@@ -2,7 +2,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.ProductProcessMapper">

    <select id="listPage" resultType="com.ruoyi.production.dto.ProductProcessDto">
    <select id="listPage" resultType="com.ruoyi.production2.dto.ProductProcessDto">
        SELECT
        *
        FROM