气瓶信息修改

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/BottleStorage.java

@@ -1,6 +1,7 @@
 package com.zd.bottle.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.zd.common.core.annotation.Excel;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
@@ -27,6 +28,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "BottleStorage对象", description = "气瓶入库表")
 @EqualsAndHashCode(callSuper = true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class BottleStorage extends BaseBean {
 
     @Excel(name = "操作人")

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/BottleStorageOut.java

@@ -1,5 +1,6 @@
 package com.zd.bottle.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.zd.common.core.annotation.Excel;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
@@ -25,6 +26,7 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @ApiModel(value = "BottleStorageOut对象", description = "气瓶出库表")
 @EqualsAndHashCode(callSuper = true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class BottleStorageOut extends BaseBean{
 
     @Excel(name = "操作人")

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/BottleStorageOutVo.java

@@ -40,6 +40,17 @@ public class BottleStorageOutVo extends BottleStorageOut {
     private String endTime;
 
     @Excel(name = "申请时间" ,type = Excel.Type.ALL,dateFormat = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
 }