From 275a85689266231fbdb0fd6e7615c06eb7fbf7b2 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 04 三月 2026 12:51:47 +0800
Subject: [PATCH] feat(moudule(qa)): 1.新增Oracle多数据源 2.新增喂丝机对应关系、第三方储丝柜信息视图等

---
 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/FeedmatchTimeData.java |   78 +++++++++++++++++++++-----------------
 1 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/FeedmatchTimeData.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/FeedmatchTimeData.java
old mode 100755
new mode 100644
index 09ad4bd..a53d88a
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/FeedmatchTimeData.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/FeedmatchTimeData.java
@@ -5,13 +5,15 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serial;
 
 /**
- * 鍠備笣鏈哄垎鏋愬璞� feedmatch_time_data
+ * 鍠備笣鏈哄搴斿叧绯诲璞� feedmatch_time_data
  *
  * @author zhuguifei
- * @date 2026-01-29
+ * @date 2026-03-02
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -22,24 +24,14 @@
     private static final long serialVersionUID = 1L;
 
     /**
-     * 鏃堕棿
+     * 鏃堕棿鎴�
      */
     private Date time;
 
     /**
-     * Key
+     * 鐝+鏈哄彴
      */
     private String key;
-
-    /**
-     * 鐝 (1浣嶆暟瀛�)
-     */
-    private Integer shift;
-
-    /**
-     * 璁惧鍙� (3浣嶆暟瀛�)
-     */
-    private Integer equNo;
 
     /**
      * 鏁版嵁鏇存柊鏃堕棿
@@ -49,106 +41,122 @@
     /**
      * 1#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖
      */
-    private Integer fs11;
+    private String fs11;
 
     /**
      * 1#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖
      */
-    private Integer fs12;
+    private String fs12;
 
     /**
      * 2#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖
      */
-    private Integer fs21;
+    private String fs21;
 
     /**
      * 2#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖
      */
-    private Integer fs22;
+    private String fs22;
 
     /**
      * 3#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖
      */
-    private Integer fs31;
+    private String fs31;
 
     /**
      * 3#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖
      */
-    private Integer fs32;
+    private String fs32;
 
     /**
      * 4#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖
      */
-    private Integer fs41;
+    private String fs41;
 
     /**
      * 4#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖
      */
-    private Integer fs42;
+    private String fs42;
 
     /**
      * 1#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�
      */
-    private Integer pipe01;
+    private Long pipe01;
 
     /**
      * 2#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�
      */
-    private Integer pipe02;
+    private Long pipe02;
 
     /**
      * 3#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�
      */
-    private Integer pipe03;
+    private Long pipe03;
 
     /**
      * 4#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�
      */
-    private Integer pipe04;
+    private Long pipe04;
 
     /**
      * 5#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�
      */
-    private Integer pipe05;
+    private Long pipe05;
 
     /**
      * 6#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�
      */
-    private Integer pipe06;
+    private Long pipe06;
 
     /**
      * 7#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�
      */
-    private Integer pipe07;
+    private Long pipe07;
 
     /**
      * 8#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�
      */
-    private Integer pipe08;
+    private Long pipe08;
 
     /**
      * 9#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�
      */
-    private Integer pipe09;
+    private Long pipe09;
 
     /**
      * 10#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�
      */
-    private Integer pipe10;
+    private Long pipe10;
 
     /**
      * 11#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�
      */
-    private Integer pipe11;
+    private Long pipe11;
 
     /**
      * 12#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�
      */
-    private Integer pipe12;
+    private Long pipe12;
 
     /**
      * 鍠備笣鏈虹姸鎬� 1-杩炴帴 0-鏂紑
      */
-    private Integer wsjState;
+    private Long wsjState;
+
+    /**
+     * 鐝
+     */
+    private Long shift;
+
+    /**
+     * 鏈哄彴
+     */
+    private Long equNo;
+
+    /**
+     * 澶囨敞
+     */
+    private String remark;
+
 
 }

--
Gitblit v1.9.3