From c64c4044957bfbdca0bf2aac8a01a4589fb36569 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Thu, 30 Oct 2025 12:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BF=A1=E6=81=AF=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E4=B8=A4=E4=B8=AA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=92=8C=E5=BA=97=E9=93=BA=E5=86=85=E9=83=A8=E8=BF=90=E8=B4=B9?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/common/modules/store/ShopStoreInfo.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreInfo.java b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreInfo.java
index 7dd53f4c..4d9136e1 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreInfo.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreInfo.java
@@ -3,11 +3,13 @@ package com.suisung.mall.common.modules.store;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -121,5 +123,18 @@ public class ShopStoreInfo implements Serializable {
     @ApiModelProperty(value = "线下买单折扣:10代表原价")
     private BigDecimal store_discount;
 
+    @ApiModelProperty(value = "店铺内部运费，单位（分）0-使用平台的内部运费；>0 使用店铺的内部运费")
+    private Integer shopping_fee_inner;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "新增时间")
+    private Date created_at;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "最后更新时间")
+    private Date updated_at;
+
 
 }