Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_qrLogin

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

@@ -360,6 +360,9 @@
             <if test="mergeFlag != null">
                 merge_flag_ = #{mergeFlag},
             </if>
+            <if test="mergeTime != null">
+                merge_time_ = #{mergeTime},
+            </if>
         </set>
         WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
@@ -1402,6 +1405,9 @@
                 <if test="item.mergeFlag != null">
                     merge_flag_ = #{item.mergeFlag},
                 </if>
+                <if test="item.mergeTime != null">
+                    merge_time_ = #{item.mergeTime},
+                </if>
                 update_time_ = NOW()
             </set>
             WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}