ソースを参照

fix:字段调整

SJ 1 週間 前
コミット
e7abe611a9

+ 2 - 2
lg-code/src/main/java/org/jeecg/modules/Contact/entity/Contact.java

@@ -44,11 +44,11 @@ public class Contact implements Serializable {
 	/**类型:发送、抄送*/
 	@Excel(name = "类型:发送、抄送", width = 15)
     @ApiModelProperty(value = "类型:发送、抄送")
-    private Integer recType;
+    private String recType;
 	/**是否启用*/
 	@Excel(name = "是否启用", width = 15)
     @ApiModelProperty(value = "是否启用")
-    private Integer isActive;
+    private String isActive;
     /**创建时间*/
     @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")

+ 6 - 3
lg-code/src/main/java/org/jeecg/modules/DefectiveProduct/entity/DefectiveProduct.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.DefectiveProduct.entity;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -47,10 +48,12 @@ public class DefectiveProduct implements Serializable {
     private String tool;
 	/**po*/
 	@Excel(name = "po", width = 15)
-    private String po;
+    private Integer po;
 	/**due_date*/
-	@Excel(name = "due_date", width = 15)
-    private String dueDate;
+	@Excel(name = "due_date", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+    private LocalDate dueDate;
 	/**comment1*/
 	@Excel(name = "comment1", width = 15)
     private String comment1;

+ 1 - 0
lg-code/src/main/java/org/jeecg/modules/DestRule/entity/DestRule.java

@@ -51,5 +51,6 @@ public class DestRule implements Serializable {
 	/**删除标记*/
 	@ApiModelProperty(value = "删除标记")
 	private int isDel;
+	private String schedule;
 
 }

+ 1 - 0
lg-code/src/main/java/org/jeecg/modules/RegionRule/entity/RegionRule.java

@@ -72,5 +72,6 @@ public class RegionRule implements Serializable {
 	/**删除标记*/
 	@ApiModelProperty(value = "删除标记")
 	private int isDel;
+	private String schedule;
 
 }