From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 58 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index e93fc7e..2597e70 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -1,6 +1,7 @@
package com.zy.asrs.entity;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
@@ -16,18 +17,37 @@
private static final long serialVersionUID = 1L;
- /**
- * 鐗╂枡
- */
- @ApiModelProperty(value= "鐗╂枡")
- private String matnr;
+ @ApiModelProperty(value= "浜у搧缂栫爜")
+ @TableId(value = "mat_no")
+ private String matNo;
+
+ @ApiModelProperty(value= "浜у搧鍚嶇О")
+ @TableId(value = "mat_name")
+ private String matName;
+
+ @ApiModelProperty(value= "瑙勬牸")
+ private String specs;
+
+ @ApiModelProperty(value= "灏哄")
+ private String size;
+
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ @ApiModelProperty(value= "鍗曢噸")
+ private Double weight;
/**
- * 鐗╂枡鎻忚堪
+ * 鏁伴噺
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
- private String maktx;
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double qty;
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value= "鍗曚綅")
+ private String unit;
/**
* 浠撳簱鍙�
@@ -38,14 +58,8 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "浜у搧绫诲埆")
private String type;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "棰滆壊")
- private String color;
/**
* 浠撳簱鍙�
@@ -66,18 +80,6 @@
private String brand;
/**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String altme;
-
- /**
* 鎵樼洏鏉＄爜
*/
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
@@ -86,7 +88,7 @@
/**
* 鐢ㄦ埛ID
*/
- @ApiModelProperty(value= "鐢ㄦ埛ID")
+ @ApiModelProperty(value= "搴撲綅鍚嶇О")
private String bname;
@ApiModelProperty(value= "搴撲綅鍙�")
--
Gitblit v1.9.1