Merge remote-tracking branch 'origin/activity_2020_12' into activity_2020_12

# Conflicts:
#	mec-biz/src/main/resources/config/mybatis/DegreeRegistrationMapper.xml

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

@@ -196,15 +196,13 @@
             <if test="createTime != null">
                 create_time_ = #{createTime},
             </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
             <if test="status != null">
                 status_ = #{status,jdbcType=INTEGER},
             </if>
             <if test="activityTag != null">
                 activity_tag_ = #{activityTag},
             </if>
+                update_time_ = NOW()
         </set>
         where id_ = #{id,jdbcType=INTEGER}
     </update>
@@ -276,7 +274,7 @@
                 <if test="degree.activityTag != null">
                     activity_tag_ = #{degree.activityTag},
                 </if>
-                update_time_ = NOW()
+                    update_time_ = NOW()
             </set>
             where id_ = #{degree.id,jdbcType=INTEGER}
         </foreach>
@@ -320,6 +318,5 @@
             user_id_ = #{userId}
             AND activity_tag_=#{activityTag}
             AND (sporadic_id_ IS NOT NULL OR theory_level_ IS NOT NULL)
-            AND status_=2
     </select>
 </mapper>