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 | 13 +++++++++++--
1 files changed, 11 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 cf885bf..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
@@ -40,9 +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=下级门店返佣")
+ @Excel(name = "变动类型", readConverterExp = "1=门店业绩，2=门店返佣，3=下级门店返佣，4=门店服务返佣")
private Integer type;
@ApiModelProperty(value = "历史余额")
@@ -53,9 +53,14 @@
@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;
@@ -67,6 +72,10 @@
@TableField("object_id")
private Long objectId;
+ @ApiModelProperty(value = "订单号")
+ @TableField("order_num")
+ private String orderNum;
+
@ApiModelProperty(value = "门店名称")
@TableField(exist = false)
@Excel(name = "门店名称")
--
Gitblit v1.7.1