Merge remote-tracking branch 'origin/master'

lin

2024-03-20 55f7fe8a1822019840a1580b05ed26ab914d3400

 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>