Merge branch 'activity_2020_12'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeRegistrationServiceImpl.java

@@ -314,7 +314,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
 
     @Override
     public Boolean updateStatus(StudentPaymentOrder studentPaymentOrder) {
-        DegreeRegistration degree = degreeRegistrationDao.getLock(studentPaymentOrder.getUserId());
+        DegreeRegistration degree = degreeRegistrationDao.getLock(studentPaymentOrder.getClassGroupId());
 
         int updateCount = studentPaymentOrderService.update(studentPaymentOrder);
         if (updateCount <= 0) {