From 0926ab253567a0040cdebe1e4176b53ef22e5d29 Mon Sep 17 00:00:00 2001
From: spdis <q17721073823@outlook.com>
Date: Tue, 14 Oct 2025 15:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app.py b/app.py
index 059b809..c8c66db 100644
--- a/app.py
+++ b/app.py
@@ -474,10 +474,7 @@ def upload_image():
 
 # 确认录入路由
 @app.route('/confirm', methods=['POST'])
-<<<<<<< HEAD
 @user_or_admin_required
-=======
->>>>>>> 30645e46ff2a6ee5c12fd95fb21b7eb4fb51c5f0
 def confirm_data():
     """
     确认并录入用户编辑后的数据
@@ -502,18 +499,11 @@ def confirm_data():
         data_string = json_to_string(edited_data)
         print(f"转换后的数据字符串: {data_string}")
         
-<<<<<<< HEAD
         # 构造新的数据结构，只包含data和image字段，并添加用户ID
         processed_data = {
             "data": data_string,
             "image": image_filename,  # 存储图片文件名
             "user_id": session['user_id']  # 添加用户ID关联
-=======
-        # 构造新的数据结构，只包含data和image字段
-        processed_data = {
-            "data": data_string,
-            "image": image_filename  # 存储图片文件名
->>>>>>> 30645e46ff2a6ee5c12fd95fb21b7eb4fb51c5f0
         }
         print(f"准备存储的数据: {processed_data}")