From c12dc71ecea33d5c23e2ceb32bfc3db68e4198e3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 23 六月 2021 09:44:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'

---
 ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
index a63cb4f..26f652a 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
@@ -27,8 +27,6 @@
 
 	/**
 	 * 涓婚敭
-	 * 濡傛灉鏄嚜瀹氫箟id 鎴栬�� 闆姳id
-	 * 闇�瑕佸鍔犲簭鍒楀寲涓哄瓧绗︿覆娉ㄨВ 鍥犱负Long鍒板墠绔細澶辩湡
 	 */
     @TableId(value = "id")
 	@JsonSerialize(using = ToStringSerializer.class)
@@ -71,7 +69,6 @@
     private String updateBy;
 
     /** 鍒犻櫎鏍囧織 */
-    @TableLogic
     private Long delFlag;
 
 }

--
Gitblit v1.9.3