diff --git a/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java b/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java index 462096698..835c152fd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java @@ -146,7 +146,7 @@ public class OrderSnapshot extends TenantEntity { private String giftList; @io.swagger.annotations.ApiModelProperty(value="卷包内容",name="giftList") - private String merchasntList; + private String merchantList; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/OrderSnapshotServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/OrderSnapshotServiceImpl.java index 40697afda..5a5d3ab5e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/OrderSnapshotServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/OrderSnapshotServiceImpl.java @@ -100,7 +100,7 @@ public class OrderSnapshotServiceImpl implements OrderSnapshotService { m->m.getMerchantStatus().equals(EnumMerchantStatus.VALID.getCode())) .collect(Collectors.toList()); } - snapshot.setMerchasntList(JSON.toJSONString(merchantList)); + snapshot.setMerchantList(JSON.toJSONString(merchantList)); if(EnumCouponType.COUPON_GIFT.getCode().equals(wxCoupon.getType())){ WxCoupon coupon = new WxCoupon(); coupon.updateTenantInfo(wxCoupon);