Merge remote-tracking branch 'origin/test' into test

2024-10-08 14:28:12 +08:00
parent 79d15b5c4e 81dce3ea75
commit 780fce1416
26 changed files with 68 additions and 1194 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;