From 1f1d6d154cc4a6311b74032af525031851b872b6 Mon Sep 17 00:00:00 2001
From: lzz <xiguabobo_2020@qq.com>
Date: 星期六, 09 十一月 2024 16:07:32 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025

---
 kunlun.sql |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/kunlun.sql b/kunlun.sql
index 9d4750b..26a4d2a 100644
--- a/kunlun.sql
+++ b/kunlun.sql
@@ -204,10 +204,12 @@
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='璀︽姤鏁版嵁';
 
--- 姝ｅ湪瀵煎嚭琛�  mayi_kunlun.warning_info 鐨勬暟鎹細~0 rows (澶х害)
 
+<<<<<<< HEAD
+=======
 /*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */;
 /*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
 /*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */;
+>>>>>>> 3037ddc8c6e0519a9e1ae6d0a9cc002033047a02

--
Gitblit v1.8.0