Merge branch 'ww' into test

2024-10-08 13:25:18 +08:00
parent f703a40903 869d14f158
commit 8c69aa7474
22 changed files with 63 additions and 1152 deletions
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
@@ -88,10 +88,6 @@ public class TbProductSku implements Serializable {
    @ApiModelProperty(value = "coverImg")
    private String coverImg;

-    @Column(name = "`warn_line`")
-    @ApiModelProperty(value = "库存警戒线")
-    private Integer warnLine;
-
    @Column(name = "`weight`")
    @ApiModelProperty(value = "weight")
    private Double weight;