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

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

@@ -418,7 +418,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 }
                 studentPaymentOrderDetail.setUpdateTime(date);
                 studentPaymentOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());
-                
+                studentPaymentOrderDetail.setTenantId(studentPaymentOrder.getTenantId());
                 totalPrice = totalPrice.add(studentPaymentOrderDetail.getPrice());
                 studentPaymentOrderDetailList.add(studentPaymentOrderDetail);
         	}
@@ -591,6 +591,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
             studentPaymentOrder.setUpdateTime(nowDate);
             studentPaymentOrder.setOrganId(subjectChange.getOrganId());
             studentPaymentOrder.setRoutingOrganId(subjectChange.getOrganId());
+            studentPaymentOrder.setTenantId(subjectChange.getTenantId());
             studentPaymentOrderService.insert(studentPaymentOrder);
 
             subjectChange.setOrderId(studentPaymentOrder.getId().intValue());
@@ -717,6 +718,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
 							}
 						}
 	                }
+	                studentPaymentOrderDetail.setTenantId(studentPaymentOrder.getTenantId());
 	                
 	                studentPaymentOrderDetailList.add(studentPaymentOrderDetail);