Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -267,17 +267,6 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
                                                   @Param("groupType") GroupType groupType);
 
     /**
-     * @describe 获取团体下未结束的课程
-     * @author Joburgess
-     * @date 2020/3/4
-     * @param groupId:
-     * @param groupType:
-     * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
-     */
-    List<CourseSchedule> findGroupNotFinishCourses(@Param("groupId") String groupId,
-                                                  @Param("groupType") GroupType groupType);
-
-    /**
      * @describe 更新课程组下课程的名字
      * @author Joburgess
      * @date 2020/3/5

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

@@ -44,7 +44,7 @@ public class ClassGroup {
 	@ApiModelProperty(value = "群名称", required = true)
 	private String groupName;
 
-	/** 群名称 */
+	/** 乐团名称 */
 	@ApiModelProperty(value = "乐团名称", required = true)
 	private String musicGroupName;
 

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

@@ -50,13 +50,13 @@
                 title_ = #{title},
             </if>
             <if test="content != null">
-                content_ = content,
+                content_ = #{content},
             </if>
             <if test="isTop != null">
                 is_top_ = #{isTop},
             </if>
             <if test="updateTime != null">
-                update_time_ = NOW()
+                update_time_ = NOW(),
             </if>
             <if test="operatorId != null">
                 operator_id_ = #{operatorId}