Merge branch 'phyzasrs-erp' into phyzasrs-erp-4

zhangc

2024-12-23 dcc9b7294a7f47c00445d2b8dec0097b6b3b0e5e

 src/main/resources/mapper/OrderMapper.xml

@@ -64,9 +64,7 @@
        update man_order
        set settle = #{settle}
        ,update_time = getdate()
        <if test="plt != null">
            ,plt_type = #{plt}
        </if>
        ,plt_type = #{plt}
        ,in_time = #{inTime}
        where 1=1
        and id = #{orderId}