Merge branch 'feature/0529-live' into master_saas

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

@@ -781,7 +781,7 @@
             <if test="groupName!=null and groupName!=''">
                 AND vg.name_ LIKE CONCAT('%', #{groupName}, '%')
             </if>
-            <if test="">
+            <if test="groupType ！= null">
                 AND vg.group_type_ = #{groupType}
             </if>
         GROUP BY