Merge remote-tracking branch 'origin/master'

puzhibing

2023-02-22 85eab076207efee683efb6fd04b2ca48b24d797a

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

@@ -39,6 +39,14 @@
    @TableField("user_id")
    private Integer userId;

    @ApiModelProperty(value = "代理商id")
    @TableField("agentId")
    private Integer agentId;

    @ApiModelProperty(value = "分公司id")
    @TableField("branchOfficeId")
    private Integer branchOfficeId;

    @ApiModelProperty(value = "优惠券名称")
    @TableField("coupon_name")
    private String couponName;
@@ -79,6 +87,22 @@
    @TableField("coupon_state")
    private Integer couponState;

    public Integer getAgentId() {
        return agentId;
    }

    public void setAgentId(Integer agentId) {
        this.agentId = agentId;
    }

    public Integer getBranchOfficeId() {
        return branchOfficeId;
    }

    public void setBranchOfficeId(Integer branchOfficeId) {
        this.branchOfficeId = branchOfficeId;
    }

    public Integer getCouponState() {
        return couponState;
    }