Merge remote-tracking branch 'origin/dev' into send_coupon

peng

2025-09-11 127a0f6ab38866d0b05b32d2102cc85638a06e62

 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;