From afe61a27c4f77db65df66b0ff5dc93cbd3e0014b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 六月 2020 17:49:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
index 60761f4..ecda896 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
@@ -248,7 +248,7 @@
// 瀹氭椂鏃堕棿
- if (StringUtil.isNullOrEmpty(record.getControlTime_str())) {
+ if (!StringUtil.isNullOrEmpty(record.getControlTime_str())) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
record.setControlTime(format.parse(record.getControlTime_str().replaceAll("T", " ")));
}
--
Gitblit v1.8.0