From f863a876aa950a92b179ab08aba93d00a5f426c1 Mon Sep 17 00:00:00 2001
From: Qiuyi LI <qiuyi.li@gmail.com>
Date: Fri, 26 Jan 2024 16:27:58 +0100
Subject: [PATCH] Update Shop model

---
 .../jeecg/modules/business/entity/Shop.java   | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Shop.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Shop.java
index 82587d91f..79654afb5 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Shop.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Shop.java
@@ -16,8 +16,8 @@ import java.io.Serializable;
 /**
  * @Description: 店铺
  * @Author: jeecg-boot
- * @Date: 2021-08-11
- * @Version: V1.1
+ * @Date: 2024-01-25
+ * @Version: V1.2
  */
 @ApiModel(value = "Shop对象", description = "店铺")
 @Data
@@ -91,10 +91,29 @@ public class Shop implements Serializable {
     @Excel(name = "订单服务费", width = 15)
     @ApiModelProperty(value = "订单服务费")
     private java.math.BigDecimal orderServiceFee;
+
     /**
-     * 包材费
+     * 是否活跃
      */
-    @Excel(name = "包材费", width = 15)
-    @ApiModelProperty(value = "包材费")
+    @Excel(name = "是否活跃", width = 15, dicCode = "yn")
+    @ApiModelProperty(value = "是否活跃")
+    private java.lang.String active;
+    /**
+     * Shopify前缀
+     */
+    @Excel(name = "Shopify前缀", width = 15)
+    @ApiModelProperty(value = "Shopify前缀")
+    private java.lang.String shopifyPrefix;
+    /**
+     * Shopify API Token
+     */
+    @Excel(name = "Shopify API Token", width = 15)
+    @ApiModelProperty(value = "Shopify API Token")
+    private java.lang.String shopifyToken;
+    /**
+     * 海外仓包材费
+     */
+    @Excel(name = "海外仓包材费", width = 15)
+    @ApiModelProperty(value = "海外仓包材费")
     private java.math.BigDecimal packagingMaterialFee;
 }