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/SparePartScrap.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartScrap.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartScrap.java
index dfeff5d..1f2e198 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartScrap.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartScrap.java
@@ -1,21 +1,17 @@
package org.jeecg.modules.spare.entity;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecg.modules.eam.entity.RepairOrderDetail;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.List;
/**
* @Description: 澶囦欢鎶ュ簾
@@ -92,7 +88,7 @@
*/
@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;
/**
* 鐘舵�� 0 绂佺敤 1 鍚敤
--
Gitblit v1.9.3