From c22b895afe54ea30e395e00ed225883243fb8309 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 30 八月 2024 18:15:24 +0800
Subject: [PATCH] 用户角色接口
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TDataGenerator.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TDataGenerator.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TDataGenerator.java
index 47d6c04..2d1e20a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TDataGenerator.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TDataGenerator.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,8 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -43,22 +46,43 @@
@ApiModelProperty(value = "开始时间")
@TableField("startTime")
- private LocalDateTime startTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate startTime;
@ApiModelProperty(value = "结束时间")
@TableField("endTime")
- private LocalDateTime endTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate endTime;
@ApiModelProperty(value = "最小金额")
@TableField("minMoney")
- private Double minMoney;
+ private BigDecimal minMoney;
@ApiModelProperty(value = "最大金额")
@TableField("maxMoney")
- private Double maxMoney;
+ private BigDecimal maxMoney;
@ApiModelProperty(value = "状态 1=生成中 2=待覆盖 3=已覆盖")
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "订单类型 1=餐饮 2=销售")
+ @TableField("orderType")
+ private Integer orderType;
+ @ApiModelProperty(value = "微信支付占比")
+ @TableField("weiXinPay")
+ private BigDecimal weiXinPay;
+ @ApiModelProperty(value = "支付宝支付占比")
+ @TableField("aliPay")
+ private BigDecimal aliPay;
+ @ApiModelProperty(value = "支付宝支付占比")
+ @TableField("cardPay")
+ private BigDecimal cardPay;
+ @ApiModelProperty(value = "现金支付占比")
+ @TableField("moneyPay")
+ private BigDecimal moneyPay;
+ @ApiModelProperty(value = "其他支付")
+ @TableField("otherPay")
+ private BigDecimal otherPay;
+
}
--
Gitblit v1.7.1