Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -86,6 +86,9 @@ public class ClassGroup {
 	@ApiModelProperty(value = "班级图标",required = false)
 	private String img;
 	
+	@ApiModelProperty(value = "备注",required = false)
+	private String memo;
+	
 	private List<ClassGroupTeacherMapper> teacherMapperList = new ArrayList<ClassGroupTeacherMapper>();
 	
 	private List<CourseSchedule> courseScheduleList = new ArrayList<CourseSchedule>();
@@ -250,6 +253,14 @@ public class ClassGroup {
 		this.img = img;
 	}
 
+	public String getMemo() {
+		return memo;
+	}
+
+	public void setMemo(String memo) {
+		this.memo = memo;
+	}
+
 	public List<ClassGroupTeacherMapper> getTeacherMapperList() {
 		return teacherMapperList;
 	}

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

@@ -21,6 +21,7 @@
         <result column="expect_student_num_" property="expectStudentNum"/>
         <result column="total_class_times_" property="totalClassTimes"/>
         <result column="img_" property="img"/>
+        <result column="memo_" property="memo"/>
         <result column="current_class_times_" property="currentClassTimes"/>
     </resultMap>
 
@@ -55,6 +56,7 @@
             <if test="totalClassTimes!=null">total_class_times_,</if>
             <if test="currentClassTimes!=null">current_class_times_,</if>
             <if test="img!=null">img_,</if>
+            <if test="img!=null">memo_,</if>
             <if test="delFlag!=null">del_flag_,</if>
         </trim>
         VALUES
@@ -72,6 +74,7 @@
             <if test="totalClassTimes!=null">#{totalClassTimes},</if>
             <if test="currentClassTimes!=null">#{currentClassTimes},</if>
             <if test="img!=null">#{img},</if>
+            <if test="memo!=null">#{memo},</if>
             <if test="delFlag!=null">#{delFlag},</if>
         </trim>
     </insert>
@@ -133,6 +136,9 @@
             <if test="img!=null">
                 img_=#{img},
             </if>
+            <if test="memo!=null">
+                memo_=#{memo},
+            </if>
             <if test="delFlag != null">
                 del_flag_ = #{delFlag},
             </if>
@@ -1141,6 +1147,9 @@
                 <if test="classGroup.img!=null">
                     img_=#{classGroup.img},
                 </if>
+                <if test="classGroup.memo!=null">
+                    memo_=#{classGroup.memo},
+                </if>
                 <if test="classGroup.delFlag != null">
                     del_flag_ = #{classGroup.delFlag},
                 </if>