修改

YijiaRestful/src/main/java/com/platform/yijia/pojo/IntegralWares.java

@@ -1,5 +1,6 @@
 package com.platform.yijia.pojo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -22,6 +23,7 @@ public class IntegralWares {
     private String createName;          //'创建人名称',
     private Date updateTime;            //'更新时间',
     private String updateBy;            //'更新人id',
-    private Date updateName;            //'更新人名称',
+    private String updateName;            //'更新人名称',
     private Integer stationId;          //'油站ID',
+    private String stationName;         //油站名称
 }

YijiaRestful/src/main/resources/mapper/IntegralWaresMapper.xml

@@ -16,13 +16,14 @@
     <result column="update_time" jdbcType="DATE" property="updateTime" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_name" jdbcType="VARCHAR" property="updateName" />
-<!--    <result column="station_id" jdbcType="INTEGER" property="stationId" />-->
+    <result column="station_id" jdbcType="INTEGER" property="stationId" />
+    <result column="station_name" jdbcType="VARCHAR" property="stationName" />
   </resultMap>
 
   <!--查询列-->
   <sql id="Base_Column_List">
     id, wares_type, wares_name, sale_integral, wares_pic, wares_detail, wares_status, create_time,
-    create_by, create_name, update_time, update_by, update_name
+    create_by, create_name, update_time, update_by, update_name, station_name
   </sql>
 
   <!--查询油站商品信息-->