From 20bf12dc209329b29ac96d01efabaa3a0ff30cb2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 26 一月 2025 17:27:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java
index d2f0547..7aac151 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java
@@ -38,7 +38,18 @@
@ApiModelProperty(value = "门店id")
@TableField("shop_id")
private Integer shopId;
-
+ @ApiModelProperty(value = "门店名称")
+ @TableField(exist = false)
+ @Excel(name = "门店名称")
+ private String shopName;
+ @ApiModelProperty(value = "店长名称")
+ @TableField(exist = false)
+ @Excel(name = "店长姓名")
+ private String shopManagerName;
+ @ApiModelProperty(value = "联系电话")
+ @TableField(exist = false)
+ @Excel(name = "联系电话")
+ private String phone;
@ApiModelProperty(value = "变动类型（1=绑定门店分佣,2=下级门店分佣,3=核销门店服务费，4=提现）")
@TableField("type")
@Excel(name = "变更类型",readConverterExp = "1=绑定门店分佣,2=下级门店分佣,3=核销门店服务费,4=提现")
@@ -51,6 +62,10 @@
@ApiModelProperty(value = "变动金额")
@TableField("variable_amount")
private BigDecimal variableAmount;
+ @ApiModelProperty(value = "变动时间")
+ @TableField("create_time")
+ @Excel(name = "变更时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
@ApiModelProperty(value = "变动金额")
@TableField(exist = false)
@Excel(name = "变更数量")
@@ -60,10 +75,7 @@
@TableField("balance")
private BigDecimal balance;
- @ApiModelProperty(value = "变动时间")
- @TableField("create_time")
- @Excel(name = "变更时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
+
@ApiModelProperty(value = "变动用户id")
@TableField("create_user_id")
@@ -73,20 +85,11 @@
@TableField("object_id")
private Long objectId;
- @ApiModelProperty(value = "门店名称")
- @TableField(exist = false)
- @Excel(name = "门店名称")
- private String shopName;
- @ApiModelProperty(value = "店长名称")
- @TableField(exist = false)
- @Excel(name = "店长名称")
- private String shopManagerName;
- @ApiModelProperty(value = "联系电话")
- @TableField(exist = false)
- @Excel(name = "联系电话")
- private String phone;
+
+
+
@ApiModelProperty(value = "开始时间")
@TableField(exist = false)
--
Gitblit v1.7.1