From 9b2837d4b844099f3b7536065ada857b136c1c92 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期三, 11 十二月 2024 15:29:12 +0800 Subject: [PATCH] 电路试验的驻波比csv报告解析2.0(加报告)+撤销项目还需要判断样品下的项目是不是全部都撤销了,如果都撤销了,样品也需要撤销 --- inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java index 378450c..e845c7a 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java @@ -244,7 +244,7 @@ @ApiModelProperty("閫氫俊:鎶�鏈礋璐d汉瀹℃牳缁撴灉2:涓嶉�氳繃;1:閫氳繃") private Integer checkState3; - @ApiModelProperty("涓嬪彂瀵硅薄(闄や簡鍏朵粬鎴愬搧澶栬繖涓瓧娈靛繀閫�,鐢ㄤ簬浼佷笟寰俊鎺ㄩ��)") + @ApiModelProperty("鏍锋満鍛�(闄や簡鍏朵粬鎴愬搧澶栬繖涓瓧娈靛繀閫�,鐢ㄤ簬浼佷笟寰俊鎺ㄩ��)") private Integer issueUser; @ApiModelProperty("闆朵欢鍙�(鍏朵粬鎴愬搧杩欎釜瀛楁闇�瑕佸~鍐欑殑淇℃伅)") @@ -259,5 +259,8 @@ @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate issueTime; + @ApiModelProperty("鍒ゅ畾瑙勫垯:涓嶈�冭檻涓嶇‘瀹氬害/鑰冭檻涓嶇‘瀹氬害(%)") + private String rule; + } -- Gitblit v1.9.3