diff --git a/src/main/java/com/zmzm/finance/common/controller/ImportController.java b/src/main/java/com/zmzm/finance/common/controller/ImportController.java index 5a14cc5..b2f6d52 100644 --- a/src/main/java/com/zmzm/finance/common/controller/ImportController.java +++ b/src/main/java/com/zmzm/finance/common/controller/ImportController.java @@ -22,11 +22,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import java.io.InputStream; import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.YearMonth; -import java.time.temporal.ChronoUnit; import java.util.*; -import java.util.stream.Collectors; /** *
@@ -52,21 +48,15 @@ public class ImportController {
public R getImportList(@RequestBody Map
@@ -35,7 +35,7 @@ public class PayZfbOrder implements Serializable {
private String tradeNo;
- private LocalDateTime notifyTime;
+ private Date notifyTime;
private String notifyType;
@@ -81,13 +81,13 @@ public class PayZfbOrder implements Serializable {
private String body;
- private LocalDateTime gmtCreate;
+ private Date gmtCreate;
- private LocalDateTime gmtPayment;
+ private Date gmtPayment;
- private LocalDateTime gmtRefund;
+ private Date gmtRefund;
- private LocalDateTime gmtClose;
+ private Date gmtClose;
private String fundBillList;
diff --git a/src/main/java/com/zmzm/finance/common/entity/ShopProduct.java b/src/main/java/com/zmzm/finance/common/entity/ShopProduct.java
index ba23b82..3c831fa 100644
--- a/src/main/java/com/zmzm/finance/common/entity/ShopProduct.java
+++ b/src/main/java/com/zmzm/finance/common/entity/ShopProduct.java
@@ -7,10 +7,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-
import java.io.Serializable;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.util.Date;
/**
*
@@ -89,12 +88,12 @@ public class ShopProduct implements Serializable {
/**
* 创建时间
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* 更新时间
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* 删除标记
diff --git a/src/main/java/com/zmzm/finance/common/entity/TCommodity.java b/src/main/java/com/zmzm/finance/common/entity/TCommodity.java
index ccf0943..eb5dc7f 100644
--- a/src/main/java/com/zmzm/finance/common/entity/TCommodity.java
+++ b/src/main/java/com/zmzm/finance/common/entity/TCommodity.java
@@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-
import java.io.Serializable;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
import java.util.Date;
/**
diff --git a/src/main/java/com/zmzm/finance/common/entity/TCurriculumCatalogue.java b/src/main/java/com/zmzm/finance/common/entity/TCurriculumCatalogue.java
index f199ea5..1e30b53 100644
--- a/src/main/java/com/zmzm/finance/common/entity/TCurriculumCatalogue.java
+++ b/src/main/java/com/zmzm/finance/common/entity/TCurriculumCatalogue.java
@@ -7,7 +7,6 @@ import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import java.time.LocalDateTime;
import java.util.Date;
/**
diff --git a/src/main/java/com/zmzm/finance/common/entity/TCustomerTaihuClass.java b/src/main/java/com/zmzm/finance/common/entity/TCustomerTaihuClass.java
index ea53c34..04abfce 100644
--- a/src/main/java/com/zmzm/finance/common/entity/TCustomerTaihuClass.java
+++ b/src/main/java/com/zmzm/finance/common/entity/TCustomerTaihuClass.java
@@ -7,7 +7,6 @@ import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import java.time.LocalDateTime;
import java.util.Date;
/**
diff --git a/src/main/java/com/zmzm/finance/common/entity/User.java b/src/main/java/com/zmzm/finance/common/entity/User.java
index 0625210..5b21c05 100644
--- a/src/main/java/com/zmzm/finance/common/entity/User.java
+++ b/src/main/java/com/zmzm/finance/common/entity/User.java
@@ -8,7 +8,7 @@ import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
/**
*
@@ -54,7 +54,7 @@ public class User implements Serializable {
/**
* 最后登录时间
*/
- private LocalDateTime lastTime;
+ private Date lastTime;
/**
* 状态0初始1删除