From ff1dcdad798b3fd484439e8a87a4d0ac75ab5720 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期五, 25 七月 2025 16:30:08 +0800 Subject: [PATCH] Merge branch 'dev_ztns' into dev_ywx_ztns --- inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java index 2fa5dc1..ceb6636 100644 --- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java @@ -17,7 +17,7 @@ * 妫�楠岄」鍋忓樊棰勮璇︽儏琛� * </p> * - * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃 + * @author * @since 2025-03-28 02:18:58 */ @Getter @@ -56,9 +56,12 @@ @ApiModelProperty("妫�娴嬫椂闂�") private LocalDateTime detectionTime; - @ApiModelProperty("鏄惁鏄棶棰樻暟鎹� 0: 鍚�, 1: 鏄�") + @ApiModelProperty("鏄惁鏄棶棰樻暟鎹� 0: 鍚�, 1: 鏄�(骞冲潎鍊�)") private Integer isIssue; + @ApiModelProperty("鏄惁鏄棶棰樻暟鎹� 0: 鍚�, 1: 鏄紙瑕佹眰鍊硷級") + private Integer isIssueAsked; + @TableField(fill = FieldFill.INSERT) private String createUser; -- Gitblit v1.9.3