From 9342bbef5659a43114193a725a96ad852eec7a79 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 17 九月 2021 23:39:27 +0800
Subject: [PATCH] fix 修复合并错误
---
sql/test.sql | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sql/test.sql b/sql/test.sql
index b7003ce2..601360a 100644
--- a/sql/test.sql
+++ b/sql/test.sql
@@ -12,7 +12,7 @@
create_by varchar(64) NULL DEFAULT NULL COMMENT '鍒涘缓浜�',
update_time datetime(0) NULL DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
update_by varchar(64) NULL DEFAULT NULL COMMENT '鏇存柊浜�',
- del_flag int(0) NULL DEFAULT NULL COMMENT '鍒犻櫎鏍囧織',
+ del_flag int(0) NULL DEFAULT 0 COMMENT '鍒犻櫎鏍囧織',
PRIMARY KEY (id) USING BTREE
) ENGINE = InnoDB COMMENT = '娴嬭瘯鍗曡〃';
@@ -29,7 +29,7 @@
create_by varchar(64) NULL DEFAULT NULL COMMENT '鍒涘缓浜�',
update_time datetime(0) NULL DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
update_by varchar(64) NULL DEFAULT NULL COMMENT '鏇存柊浜�',
- del_flag int(0) NULL DEFAULT NULL COMMENT '鍒犻櫎鏍囧織',
+ del_flag int(0) NULL DEFAULT 0 COMMENT '鍒犻櫎鏍囧織',
PRIMARY KEY (id) USING BTREE
) ENGINE = InnoDB COMMENT = '娴嬭瘯鏍戣〃';
--
Gitblit v1.9.3