From 60f70f7409ec1ece8905e088fb43e0cb0258a70b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 19 十二月 2024 10:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/enums/PointChangeType.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/enums/PointChangeType.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/enums/PointChangeType.java
similarity index 92%
rename from ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/enums/PointChangeType.java
rename to ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/enums/PointChangeType.java
index 5082a61..c6aedee 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/enums/PointChangeType.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/enums/PointChangeType.java
@@ -1,4 +1,4 @@
-package com.ruoyi.account.enums;
+package com.ruoyi.other.api.enums;
 
 import lombok.Getter;
 
@@ -14,6 +14,7 @@
     REGISTER(7, "注册积分"),
     SHOP_ACHIEVEMENT(8, "门店业绩"),
     SHOP_REBATE(9, "门店返佣"),
+    JUNIOR_SHOP_REBATE(14, "下级门店返佣"),
     TECHNICIAN_ACHIEVEMENT(10, "技师业绩"),
     EXCHANGE_GOODS(11, "兑换商品"),
     OTHER_GIFT(12, "他人赠送"),

--
Gitblit v1.7.1