Merge remote-tracking branch 'origin/master'

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

@@ -111,6 +111,8 @@ public class StudentVisit {
      */
     private Date createTime;
 
+    private Long objectId;
+
     public Integer getId() {
         return id;
     }
@@ -206,4 +208,12 @@ public class StudentVisit {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-}
+
+    public Long getObjectId() {
+        return objectId;
+    }
+
+    public void setObjectId(Long objectId) {
+        this.objectId = objectId;
+    }
+}

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

@@ -18,6 +18,7 @@
         <result column="feedback_" property="feedback"/>
         <result column="visit_time_" property="visitTime"/>
         <result column="create_time_" property="createTime"/>
+        <result column="object_id_" property="objectId"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
@@ -40,13 +41,11 @@
         <!--@mbg.generated-->
         insert into student_visit (music_group_id_, organ_id_, student_id_, teacher_id_, visiter_type_,
         type_, purpose_, overview_,
-        feedback_, visit_time_, create_time_
-        )
+        feedback_, visit_time_, create_time_,object_id_)
         values (#{musicGroupId,jdbcType=VARCHAR}, #{organId,jdbcType=INTEGER}, #{studentId,jdbcType=INTEGER},
         #{teacherId,jdbcType=INTEGER},#{visiterType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{type,jdbcType=VARCHAR}, #{purpose,jdbcType=VARCHAR}, #{overview,jdbcType=VARCHAR},
-        #{feedback,jdbcType=VARCHAR}, #{visitTime}, #{createTime}
-        )
+        #{feedback,jdbcType=VARCHAR}, #{visitTime}, #{createTime},#{objectId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentVisit">
         <!--@mbg.generated-->
@@ -79,6 +78,9 @@
             <if test="createTime != null">
                 create_time_ = #{createTime},
             </if>
+            <if test="objectId != null">
+                object_id_ = #{objectId},
+            </if>
         </set>
         where id_ = #{id,jdbcType=INTEGER}
     </update>
@@ -179,4 +181,4 @@
             #{studentId}
         </foreach>
     </select>
-</mapper>
+</mapper>