From 5aad929b87cba3e2accfd3f243fa70af180937d2 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 17 十二月 2024 09:10:28 +0800
Subject: [PATCH] 1
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java
index 86ada89..49eda6f 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java
@@ -3,14 +3,17 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -42,11 +45,11 @@
@ApiModelProperty(value = "历史余额")
@TableField("historical_point")
- private BigDecimal historicalPoint;
+ private Integer historicalPoint;
@ApiModelProperty(value = "变动金额")
@TableField("variable_point")
- private BigDecimal variablePoint;
+ private Integer variablePoint;
@ApiModelProperty(value = "变动时间")
@TableField("create_time")
@@ -60,5 +63,39 @@
@TableField("object_id")
private Long objectId;
+ @ApiModelProperty(value = "门店名称")
+ @TableField(exist = false)
+ private String shopName;
+
+ @ApiModelProperty(value = "店长姓名")
+ @TableField(exist = false)
+ private String shopLeaderName;
+
+ @ApiModelProperty(value = "联系电话")
+ @TableField(exist = false)
+ private String phone;
+
+ @TableField(exist = false)
+ private List<Integer> shopIds;
+
+ @ApiModelProperty(value = "开始时间")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endTime;
+
+ @TableField(exist = false)
+ private List<Long> userIds;
+ @TableField(exist = false)
+ private Integer pageNum;
+ @TableField(exist = false)
+ private Integer pageSize;
+
}
--
Gitblit v1.7.1