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

xuhy

2024-02-01 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/PaymentRecord.java

@@ -68,6 +68,12 @@
     */
    @TableField("insertTime")
    private Date insertTime;
    /**
     * 是否待支付（0否，1=是）
     * @return
     */
    @TableField("replacePay")
    private Integer replacePay;

    public Integer getId() {
        return id;
@@ -157,6 +163,14 @@
        this.insertTime = insertTime;
    }

    public Integer getReplacePay() {
        return replacePay;
    }

    public void setReplacePay(Integer replacePay) {
        this.replacePay = replacePay;
    }

    @Override
    public String toString() {
        return "PaymentRecord{" +