Merge branch 'main' of https://gitea.yuxindazhineng.com/admin/railway_cloud

# Conflicts:
#	app/models/lose_data.py

app/models/lose_data.py

@@ -1,3 +1,26 @@
+<<<<<<< HEAD
+from sqlalchemy import Column, Integer, String
+from ..core.database import Base
+
+
+class LoseData(Base):
+    """缺失数据记录表：记录各水准线路(期数)的原始/沉降数据缺失情况"""
+    __tablename__ = "lose_data"
+
+    id = Column(Integer, primary_key=True, index=True, autoincrement=True, comment="ID")
+    account_id = Column(Integer, nullable=False, comment="账户id", index=True)
+    NYID = Column(String(100), nullable=False, comment="期数ID", index=True)
+    linecode = Column(String(255), nullable=False, default="0", comment="水准线路编码", index=True)
+    lose_data = Column(Integer, nullable=False, default=0, comment="缺失的数据，默认是0")
+    section_id = Column(String(255), nullable=True, comment="所属断面id")
+    point_id = Column(String(100), nullable=False, comment="测点ID")
+
+    def to_dict(self):
+        return {
+            column.name: getattr(self, column.name)
+            for column in self.__table__.columns
+        }
+=======
 from sqlalchemy import Column, Integer, String, DateTime
 from ..core.database import Base
 
@@ -20,3 +43,4 @@ class LoseData(Base):
             column.name: getattr(self, column.name)
             for column in self.__table__.columns
         }
+>>>>>>> 08b556fa6e96c71bc757e9aa393457d0bbf0589b