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

admin

2020-06-30 e40d1c22c7202aac843c66f9ee9cc000744f9e10

 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", " ")));

      }