From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java |  191 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 191 insertions(+), 0 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
new file mode 100644
index 0000000..8ef2c73
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
@@ -0,0 +1,191 @@
+package com.ruoyi.basic.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 鏍囧噯鏍戜笅鐨勬楠岄」鐩�
+ * @TableName standard_product_list
+ */
+@TableName(value ="standard_product_list")
+@Data
+public class StandardProductList implements Serializable {
+    /**
+     * 涓婚敭id
+     */
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 妫�楠岄」
+     */
+    @ApiModelProperty("妫�楠岄」")
+    private String inspectionItem;
+
+    @ApiModelProperty("妫�楠岄」EN")
+    private String inspectionItemEn;
+
+    /**
+     * 妫�楠岄」灏忕被
+     */
+    @ApiModelProperty("妫�楠岄」灏忕被")
+    private String inspectionItemSubclass;
+
+    @ApiModelProperty("妫�楠岄」灏忕被EN")
+    private String inspectionItemSubclassEn;
+
+    /**
+     * 瀹為獙瀹�
+     */
+    @ApiModelProperty("瀹為獙瀹�")
+    private String laboratory;
+
+    @ApiModelProperty("瀛愬疄楠屽")
+    private String sonLaboratory;
+
+    /**
+     * 璁￠噺鍗曚綅
+     */
+    @ApiModelProperty("璁￠噺鍗曚綅")
+    private String unit;
+
+    /**
+     * 鍗曚环(鍏�)
+     */
+    @ApiModelProperty("鍗曚环")
+    private String price;
+
+    /**
+     * 宸ユ椂(H)
+     */
+    @ApiModelProperty("宸ユ椂")
+    private String manHour;
+
+    /**
+     * 宸ユ椂鍒嗙粍
+     */
+    @ApiModelProperty("宸ユ椂鍒嗙粍")
+    private String manHourGroup;
+
+    /**
+     * 妫�楠岄」绫诲瀷
+     */
+    @ApiModelProperty("妫�楠岄」绫诲瀷")
+    private String inspectionItemType;
+
+    /**
+     * 妫�楠屽�肩被鍨�
+     */
+    @ApiModelProperty("妫�楠屽�肩被鍨�")
+    private String inspectionValueType;
+
+    /**
+     * 妫�楠屾鏁�
+     */
+    @ApiModelProperty("妫�楠屾鏁�")
+    private Integer checkoutNumber;
+
+    /**
+     * 鍖洪棿
+     */
+    @ApiModelProperty("鍖洪棿")
+    private String section;
+
+    /**
+     * 鏂规硶
+     */
+    @ApiModelProperty("鏂规硶鍒楄〃")
+    private String method;
+
+    @ApiModelProperty("鏂规硶")
+    private String methodS;
+
+    /**
+     * 棰勮鏃堕棿(澶�)
+     */
+    @ApiModelProperty("棰勮鏃堕棿")
+    private Integer manDay;
+
+    /**
+     * 鐗规畩鏍囪瘑
+     */
+    @ApiModelProperty("鐗规畩鏍囪瘑")
+    private String bsm;
+
+    /**
+     * 瑕佹眰鍊�
+     */
+    @ApiModelProperty("瑕佹眰鍊�")
+    private String ask;
+
+    @ApiModelProperty("瑕佹眰鎻忚堪")
+    private String tell;
+
+    /**
+     * 澶栭敭锛氭爣鍑嗘柟娉昳d
+     */
+    @ApiModelProperty("鏍囧噯鏂规硶id")
+    private Integer standardMethodListId;
+
+    @ApiModelProperty("宸ュ巶")
+    private String factory;
+
+    @ApiModelProperty("鏍峰搧鍒嗙被")
+    private String sampleType;
+
+    @ApiModelProperty("鏍峰搧")
+    private String sample;
+
+    @ApiModelProperty("鍨嬪彿")
+    private String model;
+
+    @ApiModelProperty("鍨嬪彿")
+    private Integer templateId;
+
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+    /**
+     *
+     */
+    @ApiModelProperty("鍒涘缓鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+    /**
+     *
+     */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+    /**
+     *
+     */
+    @ApiModelProperty("淇敼鏃堕棿")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("1锛氭湁鏁� 0锛氭棤鏁�")
+    private Integer state;
+
+    private String dic;
+
+    private String tree;
+
+    private Integer structureItemParameterId;
+
+    @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
+    private String inspectionItemClass;
+
+    @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
+    private String inspectionItemClassEn;
+}

--
Gitblit v1.9.3