From 5d7cebeb0b1945351c0adb504378de171223df9d Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Mon, 15 Sep 2025 10:55:49 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E4=BB=B7=E6=A0=BC=E4=BB=8Estore?=
 =?UTF-8?q?ProductColorSize=E4=B8=AD=E5=8F=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/ry_20240629.sql                                        | 5 +++--
 .../java/com/ruoyi/xkt/domain/StoreProductColorSize.java   | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql
index 8eceee9aa..e4a90e5a1 100644
--- a/sql/ry_20240629.sql
+++ b/sql/ry_20240629.sql
@@ -3506,7 +3506,7 @@ CREATE TABLE `store_product_color`
 -- ----------------------------
 -- Table structure for store_product_color_price
 -- ----------------------------
-DROP TABLE IF EXISTS `store_product_color_price`;
+/*DROP TABLE IF EXISTS `store_product_color_price`;
 CREATE TABLE `store_product_color_price`
 (
     `id`             bigint UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '档口商品颜色价格ID',
@@ -3522,7 +3522,7 @@ CREATE TABLE `store_product_color_price`
     PRIMARY KEY (`id`) USING BTREE,
     INDEX            `idx_spcp_prodid_colorid_del`(`store_prod_id`, `store_color_id`, `del_flag`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '档口商品颜色定价' ROW_FORMAT = DYNAMIC;
-
+*/
 -- ----------------------------
 -- Table structure for store_product_color_size
 -- ----------------------------
@@ -3533,6 +3533,7 @@ CREATE TABLE `store_product_color_size`
     `store_color_id`  bigint UNSIGNED NOT NULL COMMENT '档口商品颜色ID',
     `store_prod_id`   bigint UNSIGNED NOT NULL COMMENT '档口商品ID',
     `size`            int UNSIGNED NOT NULL COMMENT '商品尺码',
+    `price`           decimal(10, 2) UNSIGNED NOT NULL COMMENT '档口商品定价',
     `sn_prefix`       varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '档口商品颜色尺码的前缀',
     `other_sn_prefix` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '其它系统条码前缀',
     `next_sn`         int UNSIGNED NULL DEFAULT NULL COMMENT '下一个条码起始值',
diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorSize.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorSize.java
index 0b70e39d8..4fa1a38e6 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorSize.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorSize.java
@@ -9,6 +9,8 @@ import lombok.experimental.Accessors;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.math.BigDecimal;
+
 /**
  * 档口商品颜色的尺码对象 store_product_color_size
  * 条码规则 5位档口ID + 8位 store_product_color_size.id + 8位 nextBarcode
@@ -43,6 +45,11 @@ public class StoreProductColorSize extends XktBaseEntity {
      */
     @Excel(name = "商品尺码")
     private Integer size;
+    /**
+     * 档口商品定价
+     */
+    @Excel(name = "档口商品定价")
+    private BigDecimal price;
     /**
      * 档口商品颜色尺码的前缀 1000100000001 xxxx
      */