合并冲突

PROJECT_RULES.md

@@ -285,7 +285,7 @@ from .services import RasterService
 # app/models/farmland.py
 from sqlalchemy import Column, Integer, Float
 from geoalchemy2 import Geometry
-from app.database import Base  # 统一的Base导入
+from app.models.orm_models import Base  # 统一的Base导入
 
 class FarmlandData(Base):
     """

app/models/city.py

@@ -1,7 +1,7 @@
 from sqlalchemy import Column, Integer, String, Text, Index, JSON
 from sqlalchemy.dialects.postgresql import JSONB
 from geoalchemy2 import Geometry
-from app.database import Base
+from app.models.orm_models import Base
 from shapely.geometry import shape, MultiPolygon, Polygon
 import json
 

app/models/county.py

@@ -1,12 +1,8 @@
 from sqlalchemy import Column, Integer, String, Text, Index, JSON
 from sqlalchemy.dialects.postgresql import JSONB
 from geoalchemy2 import Geometry
-<<<<<<< HEAD
 from app.models.orm_models import Base
-=======
-from app.database import Base
 from shapely.geometry import shape, MultiPolygon, Polygon
->>>>>>> 70db4c2c4e190ff614ee0479a8bc3b38ebf02816
 import json
 
 class County(Base):

app/models/land_use.py

@@ -6,7 +6,7 @@ Four County Three Type Land Use Model
 
 from sqlalchemy import Column, Integer, String, Float, Numeric
 from geoalchemy2.types import Geometry
-from app.models.base import Base
+from app.models.orm_models import Base
 
 
 class FourCountyLandUse(Base):

app/models/province.py

@@ -1,7 +1,7 @@
 from sqlalchemy import Column, Integer, String, Text, Index, JSON
 from sqlalchemy.dialects.postgresql import JSONB
 from geoalchemy2 import Geometry
-from app.database import Base
+from app.models.orm_models import Base
 from shapely.geometry import shape, MultiPolygon, Polygon
 import json
 

config.env

@@ -1,5 +1,5 @@
 DB_HOST=localhost
 DB_PORT=5432
-DB_NAME=soilgd
+DB_NAME=data_db
 DB_USER=postgres
-DB_PASSWORD=scau2025
+DB_PASSWORD=123456