Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

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

@@ -44,7 +44,7 @@
        from sh_order_operation_log
        where order_num = #{orderNum}
        <if test="type!= null and type != ''">
            operation_type = #{type}
           and operation_type = #{type}
        </if>
        order by log_id
    </select>