From 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:29:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/asrs/entity/Mat.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 989e678..5e779e6 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -328,32 +328,33 @@
/**
* 澶栭儴涓婚敭
*/
- @TableField("auto_id")
- private Integer autoId;
- /**
- * 璁㈠崟鍙�
- */
- @TableField("out_order_no")
- private String outOrderNo;
+// @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("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;
--
Gitblit v1.9.1