Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherDefaultPracticeGroupSalary.java

@@ -19,7 +19,7 @@ public class TeacherDefaultPracticeGroupSalary {
 	private Integer minutes;
 	
 	/**  */
-	private BigDecimal mainTeacherSalary;
+	private BigDecimal mainTeacherSalary = BigDecimal.ZERO;
 	
 	/**  */
 	private BigDecimal assistantTeacherSalary;

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

@@ -382,7 +382,7 @@
         LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
         LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
         WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId})
-        AND cg.del_flag_ = 0 AND (mg.status_ = 'PROGRESS' OR vg.group_status_ IN (2,4))
+        AND cg.del_flag_ = 0 AND (mg.status_ = 'PROGRESS' OR vg.group_status_ = 2)
         <if test="search != null">
             AND cg.name_ LIKE CONCAT('%',#{search},'%')
         </if>