From a6730b0cd8d232d06a752cec67c84b6a36a811f9 Mon Sep 17 00:00:00 2001
From: jokelone <jokelone@yeah.net>
Date: Wed, 4 Dec 2019 20:25:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1287?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B=E5=9B=BE=E7=89=87=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/pcn/model/ProduceCtgyPictureModel.java     | 58 ++++++++++++++++++++++
 .../pojo/mes/bean/MesProduceCtgyPicture.java       | 27 +++-------
 2 files changed, 66 insertions(+), 19 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProduceCtgyPictureModel.java

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProduceCtgyPictureModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProduceCtgyPictureModel.java
new file mode 100644
index 0000000..277f367
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProduceCtgyPictureModel.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import io.swagger.annotations.ApiParam;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\12\4 17:10
+ * @Modify:
+ **/
+public class ProduceCtgyPictureModel {
+
+    private Long id;
+    private String createUser;
+    private String createDatetime;
+    private String modifyUser;
+    private String modifyDatetime;
+    private String organizeCode;
+    private Integer isValid;
+    private Integer isDeleted;
+
+    @ApiParam("产品类型代码")
+    private String produceCategoryCode;
+
+    @ApiParam("面位")
+    private String sideLocation;
+
+    @ApiParam("文件id")
+    private Long fileId;
+
+    @ApiParam("文件名称")
+    private String fileName;
+    @ApiParam("文件URL")
+    private String fileUrl;
+    @ApiParam("组名")
+    private String groupName;
+
+    public ProduceCtgyPictureModel() {
+    }
+
+    public ProduceCtgyPictureModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, Integer isValid, Integer isDeleted, String produceCategoryCode, String sideLocation, Long fileId, String fileName, String fileUrl, String groupName) {
+        this.id = id;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.produceCategoryCode = produceCategoryCode;
+        this.sideLocation = sideLocation;
+        this.fileId = fileId;
+        this.fileName = fileName;
+        this.fileUrl = fileUrl;
+        this.groupName = groupName;
+    }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java
index ae64067..5ebbca0 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -30,29 +31,17 @@ public class MesProduceCtgyPicture extends BaseBean {
 
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
-    private String produceCategoryCode;
+    private String produceCtgyCode;
 
     @Column(name = "SIDE_LOCATION")
     @ApiParam("面位")
     private String sideLocation;
 
-    @Column(name = "PICTURE_URL")
-    @ApiParam("图片URL")
-    private String pictureUrl;
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private Long fileId;
 
-    @Column(name = "PICTURE_NAME")
-    @ApiParam("图片名称")
-    private String pictureName;
-
-    @Column(name = "FILE_SIZE")
-    @ApiParam("FILE_SIZE")
-    private String fileSize;
-
-    @Column(name = "FILE_TYPE_ID")
-    @ApiParam("FILE_TYPE_ID")
-    private String fileTypeId;
-
-    @Column(name = "FILE_TYPE_NAME")
-    @ApiParam("FILE_TYPE_NAME")
-    private String fileTypeName;
+    @Transient
+    @ApiParam("文件名称")
+    private String fileName;
 }