Merge remote-tracking branch 'origin/pxb' into xin

xin

2025-07-14 a5a0a3c29a97c807cda8846994d1d8df6adeb9e5

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

@@ -22,8 +22,8 @@
        <include refid="Base_Column_List"/>
        from sh_order_operation_log
        <where>
            <if test="criteria.userId != null">
                and user_id = #{criteria.userId}
            <if test="criteria.username != null">
                and username like concat('%',#{criteria.username},'%')
            </if>
            <if test="criteria.userType != null">
                and user_type = #{criteria.userType}
@@ -35,6 +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
    </select>
</mapper>