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

src/main/java/com/yxproject/start/api/LogApi.java

@@ -153,7 +153,6 @@ public class LogApi {
          for (int i=0;i<idList.size();i++){
              logService.deleteFile(idList.get(i));
          }
-
          return true;
      }
 

src/main/java/com/yxproject/start/entity/CardBodyEntity.java

@@ -2,13 +2,14 @@ package com.yxproject.start.entity;
 
 import javax.persistence.*;
 import java.sql.Time;
+import java.util.Date;
 import java.util.Objects;
 
 @Entity
 @Table(name = "CARD_BODY", schema = "YINGXIN", catalog = "")
 public class CardBodyEntity {
     private long cardBodyId;
-    private Time saveDate;
+    private Date saveDate;
     private Long cardType;
     private Long totalCount;
     private String note;
@@ -25,11 +26,11 @@ public class CardBodyEntity {
 
     @Basic
     @Column(name = "SAVE_DATE")
-    public Time getSaveDate() {
+    public Date getSaveDate() {
         return saveDate;
     }
 
-    public void setSaveDate(Time saveDate) {
+    public void setSaveDate(Date saveDate) {
         this.saveDate = saveDate;
     }
 

src/main/java/com/yxproject/start/entity/PlasticFilmEntity.java

@@ -2,13 +2,14 @@ package com.yxproject.start.entity;
 
 import javax.persistence.*;
 import java.sql.Time;
+import java.util.Date;
 import java.util.Objects;
 
 @Entity
 @Table(name = "PLASTIC_FILM", schema = "YINGXIN", catalog = "")
 public class PlasticFilmEntity {
     private long plasticFilmId;
-    private Time saveDate;
+    private Date saveDate;
     private Long totalCount;
     private Long plasticFilmType;
     private String note;
@@ -25,11 +26,11 @@ public class PlasticFilmEntity {
 
     @Basic
     @Column(name = "SAVE_DATE")
-    public Time getSaveDate() {
+    public Date getSaveDate() {
         return saveDate;
     }
 
-    public void setSaveDate(Time saveDate) {
+    public void setSaveDate(Date saveDate) {
         this.saveDate = saveDate;
     }