Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel i...

无关风月

2024-07-24 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java

@@ -205,7 +205,7 @@
    /**
     * 红包记录id
     */
    private Integer redPacketId;
    private String redPacketId;
    /**
     * 优惠券id
     */
@@ -639,13 +639,7 @@
        this.couponMoney = couponMoney;
    }

    public Integer getRedPacketId() {
        return redPacketId;
    }

    public void setRedPacketId(Integer redPacketId) {
        this.redPacketId = redPacketId;
    }

    public Integer getCouponId() {
        return couponId;