Merge branch 'dev' into user_action

peng

2025-09-16 2040c0a7fa055174f252aa3880a2506af70850cf

 framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java

@@ -170,6 +170,12 @@
    @ApiModelProperty(value = "预警数量")
    private Integer alertQuantity;

    @ApiModelProperty(value ="优惠劵id")
    private String couponId;

    @ApiModelProperty(value ="优惠劵名")
    private String couponName;

    public Double getWeight() {
        if (weight == null) {
            return 0d;
@@ -223,6 +229,7 @@
        this.storeCategoryPath = goods.getStoreCategoryPath();
        this.freightTemplateId = goods.getTemplateId();
        this.recommend = goods.getRecommend();

    }

}