Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/label/mapper/LabelMapper.xml

@@ -77,6 +77,7 @@
        FROM
            jczz_label jl  where is_deleted = 0
            and jl.id != '1002'
            order by jl.sort desc
    </select>