From e7e6d39b095b6a763e54ab34631171c3de32ec9e Mon Sep 17 00:00:00 2001
From: 李白 <7387820+wjli_13439841639@user.noreply.gitee.com>
Date: 星期五, 15 五月 2026 08:33:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
index ecfa3ea..8de5aac 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
@@ -35,9 +35,13 @@
     @Column(columnDefinition = "VARCHAR(50) comment '浜у搧Erp缂栫爜'")
     private String erpCode;
 
-    @Schema(description = "浜у搧浠锋牸")
+    @Schema(description = "浜у搧鍨嬪彿")
+    @Column(columnDefinition = "VARCHAR(50) comment '浜у搧鍨嬪彿'")
+    private String productType;
+
+  /*  @Schema(description = "浜у搧浠锋牸")
     @Column(columnDefinition = "double comment '浜у搧浠锋牸'")
-    private Double price;
+    private Double price;*/
 
     @Schema(description = "绋庣巼锛堢櫨鍒嗘瘮锛屽13琛ㄧず13%锛�")
     @Column(columnDefinition = "double default 0.00 comment '绋庣巼'")

--
Gitblit v1.9.1