料塔余量修改8

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedinglist/mapper/mapping/FeedingListMapper.xml

@@ -13,7 +13,7 @@ ON a.upload_time=b.upload_time
 </select>
 
     <select id="feedList" resultType="vip.xiaonuo.modular.feed.feedinglist.vo.FeedingListVo2">
- SELECT unit_id 'unitId',unit_name 'unitName',IFNULL(sum(feed_value),'0') 'feedValue',IFNULL(sum(margin_value),'0') 'marginValue',create_time 'createTime' FROM feeding_list
+ SELECT unit_id 'unitId',unit_name 'unitName',IFNULL(sum(feed_value),'0') 'feedValue',IFNULL(sum(margin_value),'0') 'marginValue',create_time 'uploadTime' FROM feeding_list
     ${ew.customSqlSegment}
     group BY DATE_FORMAT(create_time,'%Y-%m-%d')
     ORDER BY create_time ASC

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedinglist/vo/FeedingListVo2.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.modular.feed.feedinglist.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -13,5 +14,6 @@ public class FeedingListVo2 {
     /*饲料余量*/
     private String marginValue;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date uploadTime;
 }