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/HollowFormulaDetails.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java
index 5f6cf81..2291580 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/entity/HollowFormulaDetails.java
@@ -34,29 +34,47 @@
* 鍒嗗壊绾�
*/
@ApiModelProperty(value = "闂撮殧鏉�1浠ｇ爜 930涓撶敤")
- private Integer frameOne;
+ private String frameOne;
@ApiModelProperty(value = "闂撮殧鏉�2浠ｇ爜 930涓撶敤")
- private Integer frameTwo;
+ private String frameTwo;
@ApiModelProperty(value = "闂撮殧鏉�3浠ｇ爜 930涓撶敤")
- private Integer frameThree;
+ private String frameThree;
@ApiModelProperty(value = "闂撮殧鏉�4浠ｇ爜 930涓撶敤")
- private Integer frameFour;
+ private String frameFour;
@ApiModelProperty(value = "瀵嗗皝宓屽叆 930涓撶敤")
- private Integer sealInsert;
+ private String sealInsert;
@ApiModelProperty(value = "姘斾綋1(0鏃� 1鏈�) 930涓撶敤")
- private Integer casOne;
+ private String casOne;
@ApiModelProperty(value = "姘斾綋2(0鏃� 1鏈�) 930涓撶敤")
- private Integer casTwo;
+ private String casTwo;
@ApiModelProperty(value = "姘斾綋3(0鏃� 1鏈�) 930涓撶敤")
- private Integer casThree;
+ private String 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;
+ private String casFour;
+ @ApiModelProperty(value = "闂撮殧妗嗙被鍨�1锛坱ps鑳朵负05 閾濋棿闅旀潯01锛� 930涓撶敤")
+ private String intervalFrameTypeOne;
+ @ApiModelProperty(value = "闂撮殧妗嗗搴�1 930涓撶敤")
+ private String intervalFrameWidthOne;
+ @ApiModelProperty(value = "闂撮殧妗嗛珮搴�1 930涓撶敤")
+ private String intervalFrameHeightOne;
+ @ApiModelProperty(value = "闂撮殧妗嗙被鍨�2锛坱ps鑳朵负05 閾濋棿闅旀潯01锛� 930涓撶敤")
+ private String intervalFrameTypeTwo;
+ @ApiModelProperty(value = "闂撮殧妗嗗搴�2 930涓撶敤")
+ private String intervalFrameWidthTwo;
+ @ApiModelProperty(value = "闂撮殧妗嗛珮搴�2 930涓撶敤")
+ private String intervalFrameHeightTwo;
+ @ApiModelProperty(value = "闂撮殧妗嗙被鍨�3锛坱ps鑳朵负05 閾濋棿闅旀潯01锛� 930涓撶敤")
+ private String intervalFrameTypeThree;
+ @ApiModelProperty(value = "闂撮殧妗嗗搴�3 930涓撶敤")
+ private String intervalFrameWidthThree;
+ @ApiModelProperty(value = "闂撮殧妗嗛珮搴�3 930涓撶敤")
+ private String intervalFrameHeightThree;
+ @ApiModelProperty(value = "闂撮殧妗嗙被鍨�4锛坱ps鑳朵负05 閾濋棿闅旀潯01锛� 930涓撶敤")
+ private String intervalFrameTypeFour;
+ @ApiModelProperty(value = "闂撮殧妗嗗搴�4 930涓撶敤")
+ private String intervalFrameWidthFour;
+ @ApiModelProperty(value = "闂撮殧妗嗛珮搴�4 930涓撶敤")
+ private String intervalFrameHeightFour;
/**
* 鍒涘缓鏃堕棿
*/
--
Gitblit v1.8.0