Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

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

@@ -134,6 +134,9 @@
    @TableField("member_coupon_id")
    private String memberCouponId;

    @TableField("sure_num")
    private Integer sureNum;

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