From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartVo.java
index ef51844..b875a89 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartVo.java
@@ -160,7 +160,7 @@
      */
     @Excel(name = "鍒犻櫎鐘舵��(0-姝e父,1-宸插垹闄�)", width = 15)
     @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝e父,1-宸插垹闄�)")
-    private Integer delFlag = CommonConstant.DEL_FLAG_0;
+    private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
 
     /**
      * 鐘舵�� 0 绂佺敤 1 鍚敤

--
Gitblit v1.9.3