Merge remote-tracking branch 'origin/dev' into dev

6 years ago · 00954f2917
parent 69be002972 4dcbcf068a
commit 00954f2917
1 changed files with 4 additions and 4 deletions
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java
@ -44,10 +44,6 @@ public class MesProduceCtgyPicture extends BaseBean {
    @ApiParam("图片名称")
    private String pictureName;

-    @Column(name = "FILE_ORIGIN_NAME")
-    @ApiParam("FILE_ORIGIN_NAME")
-    private String fileOriginName;
-
    @Column(name = "FILE_SIZE")
    @ApiParam("FILE_SIZE")
    private String fileSize;
@ -55,4 +51,8 @@ public class MesProduceCtgyPicture extends BaseBean {
    @Column(name = "FILE_TYPE_ID")
    @ApiParam("FILE_TYPE_ID")
    private String fileTypeId;
+
+    @Column(name = "FILE_TYPE_NAME")
+    @ApiParam("FILE_TYPE_NAME")
+    private String fileTypeName;
 }