Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-13 63dbede8fd302de185b4ea7e085cbc9fab7419ec

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java

@@ -99,6 +99,10 @@
    @TableField("good_amount")
    private BigDecimal goodAmount;

    @ApiModelProperty(value = "用户优惠券id")
    @TableField("user_coupon_id")
    private Long userCouponId;

    @ApiModelProperty(value = "活动优惠金额")
    @TableField("activity_amount")
    private BigDecimal activityAmount;