Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

jiangqs

2023-08-06 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f

 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;
    /**
     * 商品名称
     */
@@ -134,6 +137,9 @@
    @TableField("member_coupon_id")
    private String memberCouponId;

    @TableField("sure_num")
    private Integer sureNum;

    @Override
    protected Serializable pkVal() {
        return this.consumerGoodsId;