Merge branch 'dev' into user_action

peng

2025-09-19 fa71b7aa27b81d6dde8e870da34f9b64d685df4b

 framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java

@@ -85,6 +85,12 @@
    @ApiModelProperty(value = "促销id")
    private String promotionId;

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

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

    @ApiModelProperty(value = "销售金额")
    private Double goodsPrice;