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

src/main/resources/config/mybatis/CourseGroupInfoMapper.xml

@@ -5,7 +5,7 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.collectfee.dao.CourseGroupInfoDao">
-	
+
 	<resultMap type="com.ym.mec.collectfee.entity.CourseGroupInfo" id="CourseGroupInfo">
 		<result column="id_" property="id" />
 		<result column="name_" property="name" />
@@ -20,27 +20,27 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="version" property="version" />
 	</resultMap>
-	
+
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="CourseGroupInfo" >
 		SELECT * FROM course_group_info WHERE id_ = #{id} 
 	</select>
-	
+
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="CourseGroupInfo">
 		SELECT * FROM course_group_info ORDER BY id_
 	</select>
-	
+
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.collectfee.entity.CourseGroupInfo" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		<selectKey resultClass="int" keyProperty="id" >
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
 		</selectKey>
 		-->
 		INSERT INTO course_group_info (class_id_,id_,name_,sub_id_,sub_name_,plan_num_,reg_num_,fee_type_,fee_amount_,create_time_,update_time_) VALUES(#{classId},#{id},#{name},#{subId},#{subName},#{planNum},#{regNum},#{feeType},#{feeAmount},#{createTime},#{updateTime})
 	</insert>
-	
+
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.collectfee.entity.CourseGroupInfo">
 		UPDATE course_group_info
@@ -75,17 +75,17 @@
 		</set>
 		WHERE id_ = #{id}
 	</update>
-	
+
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
 		DELETE FROM course_group_info WHERE id_ = #{id} 
 	</delete>
-	
+
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="CourseGroupInfo" parameterType="map">
 		SELECT * FROM course_group_info ORDER BY id_ <include refid="global.limit"/>
 	</select>
-	
+
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM course_group_info