From b196900d48deefb0129e28df0a842fadc3d6bff1 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:54:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

---
 src/main/java/com/zy/asrs/entity/Mat.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index bee0346..5e779e6 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -325,6 +325,40 @@
     @TableField("store_max_date")
     private Integer storeMaxDate;
 
+    /**
+     * 澶栭儴涓婚敭
+     */
+//    @TableField("auto_id")
+//    private Integer autoId;
+//    /**
+//     * 璁㈠崟鍙�
+//     */
+//    @TableField("out_order_no")
+//    private String outOrderNo;
+//
+//    /**
+//     * 鐐夊彿\瀹㈡埛鍥惧彿
+//     */
+//    @TableField("lu_hao")
+//    private String luHao;
+//
+//    /**
+//     * 宸ュ崟鍙�
+//     */
+//    @TableField("pg_no")
+//    private String sPgNO;
+
+    @TableField("temp1")
+    private String temp1;
+
+    @TableField("temp2")
+    private String temp2;
+
+    @TableField("temp3")
+    private String temp3;
+
+
+
     public Mat() {}
 
     public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {

--
Gitblit v1.9.1