页面修改

Edu.WebApi/appsettings.json

@@ -92,11 +92,7 @@
   //订单转班流程编号
   "OrderTransClassFlowId": 5,
   //订单分拆流程编号
-<<<<<<< HEAD
-  "OrderSplitClassFlowId": 6
-=======
   "OrderSplitClassFlowId": 6,
   //是否开启调课数据验证
-  "IsOpenChangeClassVerify":1,
->>>>>>> fb5d4f946a291685b92721a6797705cd4780dffe
+  "IsOpenChangeClassVerify":1
 }
\ No newline at end of file