Merge branch 'zx_online_scoretype' of http://git.dayaedu.com/yonge/cooleshow into test

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicTagMapper.xml

@@ -131,6 +131,9 @@
             <if test="param.delFlag != null">
                 and t.del_flag_ = #{param.delFlag}
             </if>
+            <if test="param.enable != null">
+                and t.state_ = #{param.enable}
+            </if>
         </where>
     </select>
     <select id="categoryList"