版本更改

etl_billiards/orchestration/task_registry.py

@@ -3,8 +3,6 @@
 from tasks.orders_task import OrdersTask
 from tasks.payments_task import PaymentsTask
 from tasks.members_task import MembersTask
-<<<<<<< HEAD
-=======
 from tasks.products_task import ProductsTask
 from tasks.tables_task import TablesTask
 from tasks.assistants_task import AssistantsTask
@@ -16,7 +14,6 @@ from tasks.topups_task import TopupsTask
 from tasks.table_discount_task import TableDiscountTask
 from tasks.assistant_abolish_task import AssistantAbolishTask
 from tasks.ledger_task import LedgerTask
->>>>>>> main
 
 class TaskRegistry:
     """任务注册和工厂"""
@@ -44,12 +41,6 @@ class TaskRegistry:
 
 # 默认注册表
 default_registry = TaskRegistry()
-<<<<<<< HEAD
-default_registry.register("ORDERS", OrdersTask)
-default_registry.register("PAYMENTS", PaymentsTask)
-default_registry.register("MEMBERS", MembersTask)
-# 可以继续注册其他任务...
-=======
 default_registry.register("PRODUCTS", ProductsTask)
 default_registry.register("TABLES", TablesTask)
 default_registry.register("MEMBERS", MembersTask)
@@ -64,4 +55,3 @@ default_registry.register("TOPUPS", TopupsTask)
 default_registry.register("TABLE_DISCOUNT", TableDiscountTask)
 default_registry.register("ASSISTANT_ABOLISH", AssistantAbolishTask)
 default_registry.register("LEDGER", LedgerTask)
->>>>>>> main