Merge remote-tracking branch 'origin/master'

Fancy

2024-09-04 86d8700e7776bf44b8fb90df1823daf147a13b27

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

@@ -110,8 +110,8 @@
            </if>
        </trim>
    </select>
    <!--下拉菜单 实现订单 产品联动效果-->
    <select id="selectAll" resultMap="BaseResultMap3">
    <!--下拉菜单订单-->
    <select id="selectAll" resultType="com.dy.pmsGlobal.pojoPr.PrOrder">
        select
        <include refid="Base_Column_List" />
        from pr_order p