From 59e2283a10aee45e6a98e34b432ba345095116db Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期三, 10 七月 2024 16:36:42 +0800
Subject: [PATCH] add 选瓦

---
 jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/domain/DaTileMatchRules.java |  174 ++++-----------------------------------------------------
 1 files changed, 14 insertions(+), 160 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/domain/DaTileMatchRules.java b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/domain/DaTileMatchRules.java
index 45c490c..4d8e338 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/domain/DaTileMatchRules.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/domain/DaTileMatchRules.java
@@ -1,9 +1,13 @@
 package com.jcdm.main.da.tileMatchRules.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.jcdm.common.annotation.Excel;
 import com.jcdm.common.core.domain.BaseEntity;
+
+import java.util.Date;
 
 /**
  * 閰嶇摝瑙勫垯瀵硅薄 da_tile_match_rules
@@ -11,9 +15,9 @@
  * @author jiang
  * @date 2024-01-24
  */
-public class DaTileMatchRules extends BaseEntity
+@Data
+public class DaTileMatchRules
 {
-    private static final long serialVersionUID = 1L;
 
     /** 涓婚敭id */
     private Long id;
@@ -44,11 +48,11 @@
 
     /** 杞村弬鏁版暟浣嶇疆 */
     @Excel(name = "杞村弬鏁版暟浣嶇疆")
-    private Long axisParameterNoPosition;
+    private Integer axisParameterNoPosition;
 
     /** 棰堝弬鏁版暟浣嶇疆 */
     @Excel(name = "棰堝弬鏁版暟浣嶇疆")
-    private Long neckParameterPosition;
+    private Integer neckParameterPosition;
 
     /** 杞村�� */
     @Excel(name = "杞村��")
@@ -74,162 +78,12 @@
     @Excel(name = "鐘舵��", readConverterExp = "1=鍚堟牸銆�2涓嶅悎鏍�")
     private String state;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setProductSeries(String productSeries) 
-    {
-        this.productSeries = productSeries;
-    }
+    /** 鍒涘缓鏃堕棿 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
-    public String getProductSeries() 
-    {
-        return productSeries;
-    }
-    public void setScanObject1(String scanObject1) 
-    {
-        this.scanObject1 = scanObject1;
-    }
-
-    public String getScanObject1() 
-    {
-        return scanObject1;
-    }
-    public void setScanObject2(String scanObject2) 
-    {
-        this.scanObject2 = scanObject2;
-    }
-
-    public String getScanObject2() 
-    {
-        return scanObject2;
-    }
-    public void setAxisName(String axisName) 
-    {
-        this.axisName = axisName;
-    }
-
-    public String getAxisName() 
-    {
-        return axisName;
-    }
-    public void setNeckName(String neckName) 
-    {
-        this.neckName = neckName;
-    }
-
-    public String getNeckName() 
-    {
-        return neckName;
-    }
-    public void setTileName(String tileName) 
-    {
-        this.tileName = tileName;
-    }
-
-    public String getTileName() 
-    {
-        return tileName;
-    }
-    public void setAxisParameterNoPosition(Long axisParameterNoPosition) 
-    {
-        this.axisParameterNoPosition = axisParameterNoPosition;
-    }
-
-    public Long getAxisParameterNoPosition() 
-    {
-        return axisParameterNoPosition;
-    }
-    public void setNeckParameterPosition(Long neckParameterPosition) 
-    {
-        this.neckParameterPosition = neckParameterPosition;
-    }
-
-    public Long getNeckParameterPosition() 
-    {
-        return neckParameterPosition;
-    }
-    public void setAxisValue(String axisValue) 
-    {
-        this.axisValue = axisValue;
-    }
-
-    public String getAxisValue() 
-    {
-        return axisValue;
-    }
-    public void setNeckValue(String neckValue) 
-    {
-        this.neckValue = neckValue;
-    }
-
-    public String getNeckValue() 
-    {
-        return neckValue;
-    }
-    public void setTileColor(String tileColor) 
-    {
-        this.tileColor = tileColor;
-    }
-
-    public String getTileColor() 
-    {
-        return tileColor;
-    }
-    public void setCreateUser(String createUser) 
-    {
-        this.createUser = createUser;
-    }
-
-    public String getCreateUser() 
-    {
-        return createUser;
-    }
-    public void setUpdateUser(String updateUser) 
-    {
-        this.updateUser = updateUser;
-    }
-
-    public String getUpdateUser() 
-    {
-        return updateUser;
-    }
-    public void setState(String state) 
-    {
-        this.state = state;
-    }
-
-    public String getState() 
-    {
-        return state;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("productSeries", getProductSeries())
-            .append("scanObject1", getScanObject1())
-            .append("scanObject2", getScanObject2())
-            .append("axisName", getAxisName())
-            .append("neckName", getNeckName())
-            .append("tileName", getTileName())
-            .append("axisParameterNoPosition", getAxisParameterNoPosition())
-            .append("neckParameterPosition", getNeckParameterPosition())
-            .append("axisValue", getAxisValue())
-            .append("neckValue", getNeckValue())
-            .append("tileColor", getTileColor())
-            .append("createUser", getCreateUser())
-            .append("createTime", getCreateTime())
-            .append("updateUser", getUpdateUser())
-            .append("updateTime", getUpdateTime())
-            .append("state", getState())
-            .toString();
-    }
+    /** 鏇存柊鏃堕棿 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 }

--
Gitblit v1.9.3