Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -435,9 +435,6 @@
             <if test="subjectId != null and subjectId != ''">
                 AND (JSON_EXTRACT(live_config_json_, '$.subjectId') = "31" OR FIND_IN_SET(#{subjectId},cg.subject_id_list_))
             </if>
-            <if test="subjectId!=null">
-                AND FIND_IN_SET(#{subjectId},cg.subject_id_list_)
-            </if>
             <if test="categoryId!=null">
                 AND FIND_IN_SET(vg.vip_group_category_id_,#{categoryId})
             </if>