From 6091a9cac0ef3236bd05137a5fae9a9cf1913ed4 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 29 四月 2024 16:03:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 18 ------------------
1 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
index 0d4126e..3f6b0c9 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
@@ -3,9 +3,6 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,7 +14,6 @@
* @author zhoush
* @since 2024-03-27
*/
-@ApiModel(description = "<p> 閽㈠寲灏忕墖淇℃伅 </p>")
@Data
@EqualsAndHashCode(callSuper = false)
public class TemperingGlassInfo implements Serializable {
@@ -27,86 +23,72 @@
/**
* 閽㈠寲灏忕墖淇℃伅琛╥d
*/
- @ApiModelProperty(value = "閽㈠寲灏忕墖淇℃伅琛╥d", position = 2)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 娴佺▼鍗�
*/
- @ApiModelProperty(value = "娴佺▼鍗�", position = 3)
private String flowcardId;
/**
* 娴佺▼鍗＄幓鐠冪被鍨�
*/
- @ApiModelProperty(value = "娴佺▼鍗＄幓鐠冪被鍨�", position = 4)
private Integer glassType;
/**
* 瀹�
*/
- @ApiModelProperty(value = "瀹�", position = 5)
private Double width;
/**
* 楂�
*/
- @ApiModelProperty(value = "楂�", position = 6)
private Double height;
/**
* 鍘氬害
*/
- @ApiModelProperty(value = "鍘氬害", position = 7)
private Double thickness;
/**
* 鑶滅郴
*/
- @ApiModelProperty(value = "鑶滅郴", position = 8)
private Integer filmsid;
/**
* 閽㈠寲鏄惁鎺ュ彈妯斁
*/
- @ApiModelProperty(value = "閽㈠寲鏄惁鎺ュ彈妯斁", position = 9)
private Integer ishorizontal;
/**
* 閽㈠寲鐗堝浘id
*/
- @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 10)
private Integer temperingLayoutId;
/**
* 閽㈠寲鐗堝浘鐗囧簭
*/
- @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭", position = 11)
private Integer temperingFeedSequence;
/**
* x鍧愭爣
*/
- @ApiModelProperty(value = "x鍧愭爣", position = 12)
private Integer xCoordinate;
/**
* y鍧愭爣
*/
- @ApiModelProperty(value = "y鍧愭爣", position = 13)
private Integer yCoordinate;
/**
* 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
*/
- @ApiModelProperty(value = "鏃嬭浆瑙掑害锛堥�嗘椂閽堬級", position = 14)
private Integer angle;
/**
* 鐘舵��
*/
- @ApiModelProperty(value = "鐘舵��", position = 15)
private Integer state;
--
Gitblit v1.8.0