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/entity/SparePartCancellingStocksDetail.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocksDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocksDetail.java
index 2f38005..faece10 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocksDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocksDetail.java
@@ -104,7 +104,7 @@
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
/**
* 搴撲綅
@@ -125,7 +125,7 @@
/**鐘舵�侊紙0鏈嚭搴擄紝1宸插嚭搴擄級*/
@Excel(name = "鐘舵�侊紙0鏈嚭搴擄紝1宸插嚭搴擄級", width = 15)
@ApiModelProperty(value = "鐘舵�侊紙0鏈嚭搴擄紝1宸插嚭搴擄級")
- private String status;
+ private java.lang.String status;
/**
* 鍑哄簱鏁伴噺
--
Gitblit v1.9.3