From 52b9d92b488aa1cdccbefe405571b7e9c600578b Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期一, 09 六月 2025 14:24:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms --- src/main/java/com/zy/asrs/entity/param/MatParam.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/param/MatParam.java b/src/main/java/com/zy/asrs/entity/param/MatParam.java index a1373e9..01feaaf 100644 --- a/src/main/java/com/zy/asrs/entity/param/MatParam.java +++ b/src/main/java/com/zy/asrs/entity/param/MatParam.java @@ -1,5 +1,7 @@ package com.zy.asrs.entity.param; +import com.baomidou.mybatisplus.annotations.TableField; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -10,10 +12,50 @@ */ @Data public class MatParam implements Serializable { + + /** + * 澶囩敤1 + */ + @ApiModelProperty(value= "澶囩敤1") + private String standby1 = ""; + + /** + * 澶囩敤2 + */ + @ApiModelProperty(value= "澶囩敤2") + private String standby2 = ""; + + /** + * 澶囩敤3 + */ + @ApiModelProperty(value= "澶囩敤3") + private String standby3 = ""; + + /** + * 澶囩敤1 + */ + @ApiModelProperty(value= "澶囩敤1") + private String boxType1 = ""; + + /** + * 澶囩敤2 + */ + @ApiModelProperty(value= "澶囩敤2") + private String boxType2 = ""; + + /** + * 澶囩敤3 + */ + @ApiModelProperty(value= "澶囩敤3") + private String boxType3 = ""; /** * 鍟嗗搧缂栧彿 */ private double anfme; + /** + * 鍟嗗搧缂栧彿 + */ + private double anfme2; /** * 鍟嗗搧缂栧彿 */ @@ -196,5 +238,9 @@ * 澶囨敞 */ private Integer times = 0; + /** + * 鍗曟嵁鍗曞彿 + */ + private String orderNo; } -- Gitblit v1.9.1