Merge branch '20220930' into master_saas

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

@@ -1335,15 +1335,11 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             return;
         }
         // MANUAL_RECEIVE 手动确认,AUTO_RECEIVE 自动确认
-        StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
-        studentPaymentOrder.setVersion(orderByOrderNo.getVersion());
-        studentPaymentOrder.setId(orderByOrderNo.getId());
-        studentPaymentOrder.setTenantId(orderByOrderNo.getTenantId());
         if (autoReceive) {
-            studentPaymentOrder.setReceiveStatus("AUTO_RECEIVE");
+            orderByOrderNo.setReceiveStatus("AUTO_RECEIVE");
         } else {
-            studentPaymentOrder.setReceiveStatus("MANUAL_RECEIVE");
+            orderByOrderNo.setReceiveStatus("MANUAL_RECEIVE");
         }
-        studentPaymentOrderDao.update(studentPaymentOrder);
+        studentPaymentOrderDao.update(orderByOrderNo);
     }
 }

mec-common/common-core/pom.xml

@@ -39,6 +39,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-oauth2</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>spring-security-oauth2-autoconfigure</artifactId>
+					<groupId>org.springframework.security.oauth.boot</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>