From 33880145617845479c6e3ba9d069eb9935d8d2ce Mon Sep 17 00:00:00 2001 From: zzw <wander.zheng@qq.com> Date: 星期二, 14 十一月 2023 16:27:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java index 27e69af..b0afcf6 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java @@ -22,13 +22,14 @@ public class SoftwareTestOrderMeasured extends BusiEntity { private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "搴忓彿") - private Integer num; - @ApiModelProperty(value = "濮旀墭鍗旾D") private Long orderId; + @ApiModelProperty(value = "搴忓彿") + private Integer no; + + @ApiModelProperty(value = "琚祴浠跺悕绉�") + private String name; @ApiModelProperty(value = "鏍囪瘑/鐗堟湰") private String identify; @@ -36,8 +37,6 @@ @ApiModelProperty(value = "鏄惁琚祴浠�") private String isMeasured; - @TableField(exist = false) - @ApiModelProperty(value = "瀛楀吀鏍囩/鍚嶇О") - private String dictLabel; + } -- Gitblit v1.9.1