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

mrzhssss

2022-05-27 c6ab1a516d8398de65512fcd380d89e46ec8e430

 src/main/resources/mapper/OrderMapper.xml

@@ -42,4 +42,15 @@

    </resultMap>

    <update id="updateSettle">
        update man_order
        set settle = #{settle}
        ,update_time = getdate()
        <if test="userId != null">
            ,update_by = #{userId}
        </if>
        where 1=1
        and id = #{orderId}
    </update>

</mapper>