Merge branch 'teacher_vip_salary' of http://git.dayaedu.com/yonge/mec into test

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

@@ -605,7 +605,7 @@
     <select id="queryCalenderStudentIds" resultType="java.lang.String">
         SELECT GROUP_CONCAT(DISTINCT student_ids_) FROM music_group_payment_calender
         WHERE status_ IN ('AUDITING','REJECT') AND music_group_id_ = #{musicGroupId}
-        <if test="batchNo != null AND batchNo != ''">
+        <if test="batchNo != null and batchNo != ''">
             AND batch_no_ != #{batchNo}
         </if>