Merge branch 'xin' into pxb

彭雪彬

2025-07-15 46f7c2ef3abc235e44c59be9b3c5396befc64888

 oying-system/src/main/resources/mapper/sh/OrderOperationLogMapper.xml

@@ -35,12 +35,12 @@
                AND operation_time BETWEEN #{criteria.operationTime[0]} AND #{criteria.operationTime[1]}
            </if>
        </where>
        order by log_id desc
        order by log_id
    </select>
    <select id="getByOrderNum" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from sh_order_operation_log
        where order_num = #{orderNum} order by log_id desc
        where order_num = #{orderNum} order by log_id
    </select>
</mapper>