Merge remote-tracking branch 'origin/master'

lin

2024-03-12 02f3b2a577143724b09a70cd13cd3e9256f5fc21

 src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml

@@ -45,6 +45,7 @@
        <include refid="selectTopics"/>
        <where>
            <if test="id != null "> parent_id = #{id}</if>
             and delete_flag = 0
        </where>
    </select>