Merge branch 'activity_2020_12'

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

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

@@ -274,7 +274,7 @@
         </foreach>
     </select>
 
-    <select id="getWithUserAndOrderType" resultType="com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail">
+    <select id="getWithUserAndOrderType" resultMap="StudentPaymentOrderDetail">
         SELECT spod.* FROM student_payment_order_detail spod
         LEFT JOIN student_payment_order spo ON spo.id_=spod.payment_order_id_
         WHERE spo.user_id_= #{userId}

mec-student/src/main/java/com/ym/mec/student/controller/DegreeController.java

@@ -102,6 +102,7 @@ public class DegreeController extends BaseController {
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
         degreeRegistration.setUserId(user.getId());
+        degreeRegistration.setActivityTag(DegreeRegistrationService.ACTIVITY_TAG);
         studentDao.getLocked(degreeRegistration.getUserId());
         DegreeRegistration degree = degreeRegistrationDao.getWithLevel(degreeRegistration);
         if(Objects.nonNull(degree) && degree.getStatus().equals(2)){