Merge remote-tracking branch 'origin/2021-04-28' into 2021-04-28

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

@@ -66,7 +66,8 @@
         <if test="operatingTag != null">
             operating_tag_,
         </if>
-        teacher_id_,create_time_,update_time_,service_tag_update_time_,cooperation_organ_id_)
+        teacher_id_,create_time_,update_time_,service_tag_update_time_,cooperation_organ_id_,
+        care_package_,come_on_package_)
         VALUES
         (#{userId},#{subjectIdList},
         <if test="serviceTag != null">
@@ -75,7 +76,8 @@
         <if test="operatingTag != null">
             #{operatingTag},
         </if>
-        #{teacherId},NOW(),NOW(),NOW(),#{cooperationOrganId})
+        #{teacherId},NOW(),NOW(),NOW(),#{cooperationOrganId},
+         #{carePackage},#{comeOnPackage})
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Student">