From 3ddb84f9f118c67e0bab27b4332779b8af0dc266 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 11:36:39 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopPoint.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 49eda6f..2939f35 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -39,8 +40,9 @@
@TableField("shop_id")
private Integer shopId;
- @ApiModelProperty(value = "变动类型（1=门店业绩，2=门店返佣，3=下级门店返佣）")
+ @ApiModelProperty(value = "变动类型（1=门店业绩，2=门店返佣，3=下级门店返佣，4=门店服务返佣）")
@TableField("type")
+ @Excel(name = "变动类型", readConverterExp = "1=门店业绩，2=门店返佣，3=下级门店返佣，4=门店服务返佣")
private Integer type;
@ApiModelProperty(value = "历史余额")
@@ -49,10 +51,17 @@
@ApiModelProperty(value = "变动金额")
@TableField("variable_point")
+ @Excel(name = "变动金额")
private Integer variablePoint;
+
+ @ApiModelProperty(value = "变动后余额")
+ @TableField("balance")
+ private Integer balance;
@ApiModelProperty(value = "变动时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "变动时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "变动用户id")
@@ -63,16 +72,23 @@
@TableField("object_id")
private Long objectId;
+ @ApiModelProperty(value = "订单号")
+ @TableField("order_num")
+ private String orderNum;
+
@ApiModelProperty(value = "门店名称")
@TableField(exist = false)
+ @Excel(name = "门店名称")
private String shopName;
@ApiModelProperty(value = "店长姓名")
@TableField(exist = false)
+ @Excel(name = "店长姓名")
private String shopLeaderName;
@ApiModelProperty(value = "联系电话")
@TableField(exist = false)
+ @Excel(name = "联系电话")
private String phone;
@TableField(exist = false)
--
Gitblit v1.7.1