Merge remote-tracking branch 'origin/master'

Fancy

2024-07-31 27c0c61e48bfb3e870d44b3b53a820568fcce5d5

 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