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

This commit is contained in:
yuezhihang
2021-08-27 17:44:02 +08:00
2 changed files with 3 additions and 3 deletions
@@ -111,7 +111,7 @@ public class SendBussMQService {
if (StringUtils.isNotBlank(infoEO.getPutTime())) {
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
put_time_data = format.parse(dateFormatToStr(infoEO.getIssueTime())+" 00:00:00");
put_time_data = format.parse(dateFormatToStr(infoEO.getPutTime())+" 00:00:00");
} catch (ParseException ignored) {
}
}