Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ConsumerGoods.java

@@ -108,6 +108,9 @@
     */
    @TableField("goods_type")
    private Integer goodsType;

    @TableField("goods_tag")
    private String goodsTag;
    /**
     * 商品名称
     */
@@ -123,6 +126,19 @@
     */
    @TableField("goods_nurses")
    private String goodsNurses;
    /**
     * 来源1订单2优惠券3奖品
     */
    @TableField("source_from")
    private Integer sourceFrom;
    /**
     * 用户优惠券id
     */
    @TableField("member_coupon_id")
    private Long memberCouponId;

    @TableField("sure_num")
    private Integer sureNum;

    @Override
    protected Serializable pkVal() {