Merge remote-tracking branch 'origin/dev' into dev

peng

2025-07-07 b83b070dc8cc823c877aa3a2ade134272ec0641a

 framework/src/main/resources/mapper/lmk/TagMapper.xml

@@ -20,7 +20,10 @@
            and t.tag_name like concat('%',#{query.tagName},'%')
        </if>
        <if test="query.tagTypeId != null and query.tagTypeId  != ''">
            and t.tag_type_id like concat('%',#{query.tagTypeId},'%')
            and t.tag_type_id = #{query.tagTypeId}
        </if>
        <if test="query.tagTypeKey != null and query.tagTypeKey  != ''">
            and tt.type_key = #{query.tagTypeKey}
        </if>
        order by t.sort_num
    </select>