Commit a7b2a453cad43b015200b6dc7446a5932747f9a3
Merge branch 'dev'
Showing
1 changed file
with
2 additions
and
2 deletions
src/main/java/com/cnlive/shenhe/serviceImpl/LiveServiceImpl.java
| @@ -131,7 +131,7 @@ public class LiveServiceImpl { | @@ -131,7 +131,7 @@ public class LiveServiceImpl { | ||
| 131 | if (CommonUtils.isNotEmpty(start_date)) { | 131 | if (CommonUtils.isNotEmpty(start_date)) { |
| 132 | Timestamp startdate = null; | 132 | Timestamp startdate = null; |
| 133 | try { | 133 | try { |
| 134 | - startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd HH:mm"); | 134 | + startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd"); |
| 135 | } catch (ParseException e) { | 135 | } catch (ParseException e) { |
| 136 | e.printStackTrace(); | 136 | e.printStackTrace(); |
| 137 | } | 137 | } |
| @@ -141,7 +141,7 @@ public class LiveServiceImpl { | @@ -141,7 +141,7 @@ public class LiveServiceImpl { | ||
| 141 | if ( CommonUtils.isNotEmpty(end_date)) { | 141 | if ( CommonUtils.isNotEmpty(end_date)) { |
| 142 | Timestamp enddate = null; | 142 | Timestamp enddate = null; |
| 143 | try { | 143 | try { |
| 144 | - enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd HH:mm"); | 144 | + enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd"); |
| 145 | } catch (ParseException e) { | 145 | } catch (ParseException e) { |
| 146 | e.printStackTrace(); | 146 | e.printStackTrace(); |
| 147 | } | 147 | } |