From 77e1a3c262f53ed3234151058b8ec8196998ada0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 18:03:00 +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/ShopPoint.java | 4 ++--
1 files changed, 2 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 2939f35..9fbcae4 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=下级门店返佣，4=门店服务返佣）")
+ @ApiModelProperty(value = "变动类型（1=门店业绩，2=门店返佣，3=下级门店返佣）")
@TableField("type")
- @Excel(name = "变动类型", readConverterExp = "1=门店业绩，2=门店返佣，3=下级门店返佣，4=门店服务返佣")
+ @Excel(name = "变动类型", readConverterExp = "1=门店服务返佣，2=门店返佣，3=下级门店返佣")
private Integer type;
@ApiModelProperty(value = "历史余额")
--
Gitblit v1.7.1