Merge remote-tracking branch 'origin/master'

linwei

2026-04-02 3c5245acf0a1b1ecb44980a013a3a73d82bffa57

 drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/OssMapper.xml

@@ -61,7 +61,7 @@
        select
        bo.*
        from blade_oss bo
        left join sys_oss_bind sob on bo.id = sob.oss_id
        left join sys_oss_bind sob on bo.id = sob.oss_id::VARCHAR
        where bo.is_deleted = 0
        and bo.status = 2
        and sob.sn = #{sn}