From afe6bc19be0bab2c46b7e9a59bb7987831e16ae3 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 17 一月 2025 11:18:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowTaskRequest.java | 42 +++---------------------------------------
1 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowTaskRequest.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowTaskRequest.java
index 8aea28c..9fdd7da 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowTaskRequest.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowTaskRequest.java
@@ -17,46 +17,10 @@
private String flowCardId;
@ApiModelProperty(value = "璺嚎锛�930锛堟潕璧涘厠锛岀晫闈㈤渶瑕佽緭鍏ョ浉鍏虫暟鎹級 931")
private int cell;
- @ApiModelProperty(value = "閰嶅鏁伴噺 930 931")
+ @ApiModelProperty(value = "閰嶅鏁伴噺")
private int totalPairQuantity;
- @ApiModelProperty(value = "闄よ啘鏂瑰紡 930 931")
- private Integer filmRemove;
- @ApiModelProperty(value = "涓婁晶闄よ啘閲� 930 931")
- private Integer topRemove;
- @ApiModelProperty(value = "涓嬩晶闄よ啘閲� 930 931")
- private Integer bottomRemove;
- @ApiModelProperty(value = "宸︿晶闄よ啘閲� 930 931")
- private Integer leftRemove;
- @ApiModelProperty(value = "鍙充晶闄よ啘閲� 930 931")
- private Integer rightRemove;
-
- /**
- * 鍒嗗壊绾�
- */
- @ApiModelProperty(value = "闂撮殧鏉�1浠ｇ爜 930涓撶敤")
- private Integer frameOne;
- @ApiModelProperty(value = "闂撮殧鏉�2浠ｇ爜 930涓撶敤")
- private Integer frameTwo;
- @ApiModelProperty(value = "闂撮殧鏉�3浠ｇ爜 930涓撶敤")
- private Integer frameThree;
- @ApiModelProperty(value = "闂撮殧鏉�4浠ｇ爜 930涓撶敤")
- private Integer frameFour;
- @ApiModelProperty(value = "瀵嗗皝宓屽叆 930涓撶敤")
- private Integer sealInsert;
- @ApiModelProperty(value = "姘斾綋1(0鏃� 1鏈�) 930涓撶敤")
- private Integer casOne;
- @ApiModelProperty(value = "姘斾綋2(0鏃� 1鏈�) 930涓撶敤")
- private Integer casTwo;
- @ApiModelProperty(value = "姘斾綋3(0鏃� 1鏈�) 930涓撶敤")
- private Integer casThree;
- @ApiModelProperty(value = "姘斾綋4(0鏃� 1鏈�) 930涓撶敤")
- private Integer casFour;
- @ApiModelProperty(value = "闂撮殧妗嗙被鍨嬶紙tps鑳朵负05 閾濋棿闅旀潯01锛� 930涓撶敤")
- private Integer intervalFrameType;
- @ApiModelProperty(value = "闂撮殧妗嗗搴� 930涓撶敤")
- private Integer intervalFrameWidth;
- @ApiModelProperty(value = "闂撮殧妗嗛珮搴� 930涓撶敤")
- private Integer intervalFrameHeight;
+ @ApiModelProperty(value = "閰嶆柟id")
+ private Long formulaId;
}
--
Gitblit v1.8.0