From 14411ddd5b7ac4622c5ac734354011cbef031578 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 17 十月 2025 14:03:48 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/third/erp/entity/ItemTB.java | 163 +++++++----------------------------------------------
1 files changed, 23 insertions(+), 140 deletions(-)
diff --git a/src/main/java/com/zy/third/erp/entity/ItemTB.java b/src/main/java/com/zy/third/erp/entity/ItemTB.java
index b66982e..57fcb1e 100644
--- a/src/main/java/com/zy/third/erp/entity/ItemTB.java
+++ b/src/main/java/com/zy/third/erp/entity/ItemTB.java
@@ -1,19 +1,18 @@
package com.zy.third.erp.entity;
import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
-import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@NoArgsConstructor
@@ -22,196 +21,80 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "AutoId", type = IdType.AUTO)
- private Integer autoId;
+ @TableId(value = "auto_id", type = IdType.AUTO)
+ private Integer AutoId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "ItemId", type = IdType.INPUT)
@TableField("ItemId")
private String ItemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemCode")
private String ItemCode;
@TableField("ItemName")
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String ItemName;
@TableField("ItemSpc")
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String ItemSpc;
@TableField("ItemPic")
private String itemPic;
@TableField("ItemUnit")
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String ItemUnit;
/**
* 姣涘澂銆佸崐鎴愬搧銆佹垚鍝�
*/
@TableField("ItemKind")
- @ApiModelProperty(value= "姣涘澂銆佸崐鎴愬搧銆佹垚鍝�")
+ @ApiModelProperty(value = "姣涘澂銆佸崐鎴愬搧銆佹垚鍝�")
private String ItemKind;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Remark")
private String Remark;
/**
* 00锛氭柊澧� 22锛氬垹闄�
*/
- @ApiModelProperty(value= "00锛氭柊澧� 22锛氬垹闄�")
+ @ApiModelProperty(value = "00锛氭柊澧� 22锛氬垹闄�")
@TableField("Flag")
private String Flag;
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss.fff")
@TableField("MakeDate")
private Date MakeDate;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Temp1")
private String Temp1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Temp2")
private String Temp2;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Temp3")
private String Temp3;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("LKName")
private String LKName;
-
-// ItemTB itemTB = new ItemTB(
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, //
-// null, // [闈炵┖]
-// null, // 姣涘澂銆佸崐鎴愬搧銆佹垚鍝�
-// null, //
-// null, // 00锛氭柊澧� 22锛氬垹闄�
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getItemId() {
- return ItemId;
- }
-
- public void setItemId(String ItemID) {
- this.ItemId = ItemID;
- }
-
- public String getItemCode() {
- return ItemCode;
- }
-
- public void setItemCode(String ItemCode) {
- this.ItemCode = ItemCode;
- }
-
- public String getItemName() {
- return ItemName;
- }
-
- public void setItemName(String ItemName) {
- this.ItemName = ItemName;
- }
-
- public String getItemSpc() {
- return ItemSpc;
- }
-
- public void setItemSpc(String ItemSpc) {
- this.ItemSpc = ItemSpc;
- }
-
- public String getItemUnit() {
- return ItemUnit;
- }
-
- public void setItemUnit(String ItemUnit) {
- this.ItemUnit = ItemUnit;
- }
-
- public String getItemKind() {
- return ItemKind;
- }
-
- public void setItemKind(String ItemKind) {
- this.ItemKind = ItemKind;
- }
-
- public String getRemark() {
- return Remark;
- }
-
- public void setRemark(String remark) {
- this.Remark = remark;
- }
-
- public String getFlag() {
- return Flag;
- }
-
- public void setFlag(String flag) {
- this.Flag = flag;
- }
-
- public Date getMakeDate() {
- return MakeDate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.MakeDate)){
+ public String getMakedate$() {
+ if (Cools.isEmpty(this.MakeDate)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.MakeDate);
}
-
- public void setMakeDate(Date makeDate) {
- this.MakeDate = makeDate;
- }
-
- public String getTemp1() {
- return Temp1;
- }
-
- public void setTemp1(String temp1) {
- this.Temp1 = temp1;
- }
-
- public String getTemp2() {
- return Temp2;
- }
-
- public void setTemp2(String temp2) {
- this.Temp2 = temp2;
- }
-
- public String getTemp3() {
- return Temp3;
- }
-
- public void setTemp3(String temp3) {
- this.Temp3 = temp3;
- }
-
-
}
--
Gitblit v1.9.1