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/dto/product/TbProductSkuDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductSkuDto.java
@@ -68,9 +68,6 @@ public class TbProductSkuDto implements Serializable {

    private String coverImg;

-    /** 库存警戒线 */
-    private Integer warnLine;
-
    private Double weight;

    private Float volume;