Merge remote-tracking branch 'origin/master'

刘小明

2024-08-13 9bfdf1ff20086c04bbe6576706bfee95c9d7fea0

 pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml

@@ -156,7 +156,7 @@
            <!--            </if>-->
        </trim>
    </select>
    <select id="queryAll" resultType="map">
    <select id="queryAll" resultType="java.util.HashMap">
        select
            CAST(id AS CHAR) AS id,name
        from pr_production_process