From d0a6fc23f31f924cb1744397478dc4c7c57c04e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java |  143 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 143 insertions(+), 0 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java
new file mode 100644
index 0000000..e9e930a
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java
@@ -0,0 +1,143 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.time.LocalDateTime;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/10
+ */
+@Data
+@TableName("cnas_satisfaction_survey")
+public class CnasSatisfactionSurvey implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 涓婚敭id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 椤圭洰鍚嶇О
+     */
+    private String projectName;
+
+    /**
+     * 璋冩煡鏃ユ湡
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date surveyDate;
+
+    /**
+     * 瀹㈡埛鍗曚綅鍚嶇О
+     */
+    private String userUnit;
+
+    ///**
+    // * 鏃ユ湡
+    // */
+    //@DateTimeFormat(pattern = "yyyy-MM-dd")
+    //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    //private Date dateInfo;
+
+    /**
+     * 濉啓浜哄鍚�
+     */
+    private String fillName;
+
+    /**
+     * 鑱屼綅
+     */
+    private String post;
+
+    /**
+     * 鑱旂郴鐢佃瘽
+     */
+    private String telephone;
+
+    /**
+     * 褰曞叆鏃ユ湡
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date entryDate;
+
+    /**
+     * 褰曞叆浜篿d
+     */
+    private Long userId;
+
+    /**
+     * 褰曞叆浜哄悕绉�
+     */
+    private String userName;
+
+    /**
+     * 闄勪欢鍦板潃
+     */
+    private String fileUrl;
+
+    /**
+     * 鏈嶅姟鎬佸害
+     */
+    private String serviceAttitude;
+
+    /**
+     * 鎶�鏈兘鍔�
+     */
+    private String technicalPower;
+
+    /**
+     * 妫�娴嬪伐浣�
+     */
+    private String testJob;
+
+    /**
+     * 鏀硅繘瑕佹眰
+     */
+    private String improvementRequirements;
+
+    /**
+     * 鍏朵粬琛ュ厖
+     */
+    private String otherSupplements;
+
+    @TableLogic(value = "1")
+    private Integer state;
+
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    private LocalDateTime createdTime;
+
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    private LocalDateTime updatedTime;
+
+    /**
+     * 鏀惰垂鍚堢悊鎬�
+     */
+    private String reasonableCharge;
+}
+

--
Gitblit v1.9.3