From 7748cd8a79548e94299d24e080c4650924a215da Mon Sep 17 00:00:00 2001 From: zzw <wander.zheng@qq.com> Date: 星期二, 28 十一月 2023 09:16:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java index 209d676..5f3b574 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java @@ -40,6 +40,9 @@ @ApiModelProperty(value = "娴嬭瘯渚濇嵁") private String testBasis; + @ApiModelProperty(value = "娴嬭瘯渚濇嵁鍏朵粬锛�") + private String otherBasis; + @ApiModelProperty(value = "娴嬭瘯绫诲瀷1") private String testType1; @@ -48,6 +51,9 @@ @ApiModelProperty(value = "娴嬭瘯鏍囧噯") private String testStandard; + + @ApiModelProperty(value = "娴嬭瘯鏍囧噯鍏朵粬") + private String otherStandard; @ApiModelProperty(value = "寮�濮嬫棩鏈�") @JsonFormat(pattern = "yyyy-MM-dd") @@ -63,6 +69,9 @@ @ApiModelProperty(value = "鍏朵粬瑕佹眰") private String otherRequire; + @ApiModelProperty(value = "鍏朵粬瑕佹眰鍏朵粬") + private String requireOther; + @ApiModelProperty(value = "娴嬭瘯鏃ユ湡") @JsonFormat(pattern = "yyyy-MM-dd") private Date testDate; @@ -77,6 +86,9 @@ @ApiModelProperty(value = "鐗╁搧鎬ц川") private String articleNature; + @ApiModelProperty(value = "鐗╁搧鎬ц川鍏朵粬") + private String otherNature; + @ApiModelProperty(value = "鏍峰搧鐘舵��") private String sampleStatus; -- Gitblit v1.9.1