Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDr...

puzhibing

2023-07-26 709a4a10be56952ead6340e4822fce41a66e47cd

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java

@@ -92,11 +92,11 @@

    @ApiModelProperty(value = "优惠券数量")
    @TableField("coupon_count")
    private Integer couponCount;
    private Long couponCount;

    @ApiModelProperty(value = "剩余数量")
    @TableField("remaining_quantity")
    private Integer remainingQuantity;
    private Long remainingQuantity;

    @ApiModelProperty(value = "删除 true未删除 false已删除")
    @TableField("status")
@@ -111,19 +111,19 @@
        this.status = status;
    }

    public Integer getRemainingQuantity() {
    public Long getRemainingQuantity() {
        return remainingQuantity;
    }

    public void setRemainingQuantity(Integer remainingQuantity) {
    public void setRemainingQuantity(Long remainingQuantity) {
        this.remainingQuantity = remainingQuantity;
    }

    public Integer getCouponCount() {
    public Long getCouponCount() {
        return couponCount;
    }

    public void setCouponCount(Integer couponCount) {
    public void setCouponCount(Long couponCount) {
        this.couponCount = couponCount;
    }