合并代码

app/models/lose_data.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 from sqlalchemy import Column, Integer, String
 from ..core.database import Base
 
@@ -20,27 +19,3 @@ class LoseData(Base):
             column.name: getattr(self, column.name)
             for column in self.__table__.columns
         }
-=======
-from sqlalchemy import Column, Integer, String, DateTime
-from ..core.database import Base
-
-class LoseData(Base):
-    __tablename__ = "lose_data"
-
-    id = Column(Integer, primary_key=True, index=True, autoincrement=True)
-    account_id = Column(String(100), nullable=False, comment="水准线路编码", index=True)
-    NYID = Column(String(100), nullable=False, comment="期数id", index=True)
-    linecode = Column(String(100), nullable=False, comment="水准线路编码", index=True)
-    benchmarkids = Column(String(100), comment="工作基点名称序列")
-    point_id = Column(String(100), nullable=False, comment="观测点id", index=True)
-    section_id = Column(String(100), nullable=False, comment="所属断面id")
-    lose_data = Column(String(100), comment="水准观测类型")
-
-    # 模型转字典
-    def to_dict(self):
-        """将模型实例转换为字典，支持 Pydantic 序列化"""
-        return {
-            column.name: getattr(self, column.name)
-            for column in self.__table__.columns
-        }
->>>>>>> 08b556fa6e96c71bc757e9aa393457d0bbf0589b