Merge remote-tracking branch 'origin/master'

linwe

2023-12-20 f213e5a87147de99afedf92fe78086c1aaa6d3c1

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

@@ -125,7 +125,7 @@
        jpd.appoint_user,
        jpd.user_ids,
        jpd.event_type,
        (SELECT user_id from jczz_user_public_enroll where user_id = #{userId})userId
        (SELECT user_id from jczz_user_public_enroll where user_id = #{userId} and public_discuss_id = jpd.id)userId
        from
        jczz_public_discuss jpd
        <where>