Merge branch 'feature/1022_vip' of http://git.dayaedu.com/yonge/mec into test

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

@@ -189,8 +189,8 @@
         SELECT COUNT(cto.id_)
         FROM cloud_teacher_order cto LEFT JOIN student_payment_order spo on cto.order_id_ = spo.id_
         where spo.type_ = 'MEMBER'
-        <if test="status != null">
-        	and cto.status_ = #{status}
+        <if test="status != null and status != ''">
+            and FIND_IN_SET(cto.status_,#{status})
         </if>
         <if test="studentId != null">
         	and cto.student_id_ = #{studentId}