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

whycq

2022-09-12 c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f

 src/main/resources/mapper/OrderMapper.xml

@@ -44,7 +44,7 @@
    </resultMap>

    <update id="updateSettle">
        update man_order set settle = #{settle} where 1=1 and order_no = #{orderNo} and host_id = #{hostId}
        update man_receive set settle = #{settle} where 1=1 and order_no = #{orderNo} and host_id = #{hostId}
    </update>

    <select id="getPage" resultMap="BaseResultMap">