Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-09-04 f4c8c73bc5181b6d3265c6a0ce19ae13c600baa3

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java

@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.warpper;

import com.baomidou.mybatisplus.annotations.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

@@ -33,6 +34,16 @@

    @ApiModelProperty("状态")
    private Integer state;
    @ApiModelProperty("0先付 1后付")
    private Integer payMethod;

    public Integer getPayMethod() {
        return payMethod;
    }

    public void setPayMethod(Integer payMethod) {
        this.payMethod = payMethod;
    }

    public Integer getState() {
        return state;