From 221b72ce4da14b97dc5aa5afe43eae2c68fb88b0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 18 七月 2025 20:53:21 +0800
Subject: [PATCH] Merge branch 'huliguo' of http://120.76.84.145:10101/gitblit/r/java/ZhengShengXinAdmin into huliguo

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/Industry.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Industry.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Industry.java
index c32ab5d..71f20f1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Industry.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Industry.java
@@ -23,4 +23,8 @@
     @TableField("order_num")
     @ApiModelProperty(value = "显示顺序(默认0)")
     private Integer orderNum;
+
+    @TableField("del_flag")
+    @ApiModelProperty("删除标志(0-未删除,1-已删除)")
+    private Integer delFlag;
 }
\ No newline at end of file

--
Gitblit v1.7.1