From 6170908b69269ee14eae05787eafe682fda00eef Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 八月 2023 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 production-server/src/main/java/com/yuanchu/mom/pojo/dto/ManualTechnologyDto1.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/production-server/src/main/java/com/yuanchu/mom/pojo/dto/ManualTechnologyDto1.java b/production-server/src/main/java/com/yuanchu/mom/pojo/dto/ManualTechnologyDto1.java
new file mode 100644
index 0000000..776a451
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/pojo/dto/ManualTechnologyDto1.java
@@ -0,0 +1,53 @@
+package com.yuanchu.mom.pojo.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
+//鏌ョ湅鎺掍骇璇︽儏涓殑璁″垝缂栧埗
+@Data
+public class ManualTechnologyDto1 {
+
+    /**
+     * 宸ュ簭id
+     **/
+    private Integer mtechId;
+
+    /**
+     * 宸ュ簭鍚嶇О
+     **/
+    private String techname;
+
+    /**
+     * 宸ュ簭鐖剁被
+     **/
+    private String techfather;
+
+
+    /**
+     * 璁惧鍚�(鏈哄彴)
+     **/
+    private String deviceName;
+
+
+    /**
+     * 寮�濮嬫棩鏈�(璁″垝)
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startTime;
+
+    /**
+     * 缁撴潫鏃ユ湡(璁″垝)
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endTime;
+
+    /**
+     * 鍛ㄦ湡
+     **/
+    private Integer period;
+}

--
Gitblit v1.9.3