Merge branch 'master' of https://gogs.tjp.com.cn/maoming/python-fastapi-mm-zhcs-yj-api

routers/api/dutyManagement/schedule.py

@@ -699,7 +699,7 @@ async def create_contact(
         duty_data = {}
         duty_persion_data = {}
         import_status = True
-        for row in range(2, sheet.nrows):
+        for row in range(5, sheet.nrows):
             user_data = []
             start_date = sheet.cell(row, 0).value
 

routers/api/emergencyPlans/__init__.py

@@ -845,6 +845,8 @@ async def get_emergency_training(
                 "startTime":training.start_time.strftime('%Y-%m-%d %H:%M:%S'),
                 "endTime": training.end_time.strftime('%Y-%m-%d %H:%M:%S'),
                 "address": training.training_location,
+                "lon":training.training_lon,
+                "lat":training.training_lat,
                 "Content":training.training_content
             }