From c977f0e2fd86ca3e9e3ad3961f702206c41d2767 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 二月 2025 10:41:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 8589721..7fc46d3 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -47,6 +47,9 @@
public static final String BIKE_TYPE ="0,1,2,3,4,5,6,7,8" ;
public static final String MINI_PROGRAMME_REALEASE ="MINI_PROGRAMME_REALEASE" ;
public static final int FOUR =4 ;
+ public static final String PAUSE_BIKE_TYPE ="PAUSE_BIKE_TYPE" ;
+ public static final String HEART_TIME_EXPIRE_TIME ="HEART_TIME_EXPIRE_TIME" ;
+ public static final String PARK_LAT_LNG_LIST = "PARK_LAT_LNG_LIST";
public static String REDIS_DEBUG_STR="test_";
public static final String AD = "AD";
public static String REPAIR = "REPAIR";
@@ -115,7 +118,9 @@
REFUND(2,"缁撶畻閫�鎶奸噾", "缁撶畻閫�鎶奸噾"),
- PLATFORMREFUND(3,"骞冲彴閫�鎶奸噾", "骞冲彴閫�鎶奸噾")
+ PLATFORM_REFUND(3,"骞冲彴閫�娆�", "骞冲彴閫�娆�"),
+
+ DISCOUNT(4,"骞冲彴濂楅", "骞冲彴濂楅")
;
String name;
@@ -420,7 +425,8 @@
BACK_CYCLING("宸茶繕杞�", 2,"宸茶繕杞�"),
- LOCKING_DEFEAT("寮�閿佸け璐�", 3,"寮�閿佸け璐�")
+ LOCKING_DEFEAT("寮�閿佸け璐�", 3,"寮�閿佸け璐�"),
+ RIDES_PAUSING("涓村仠涓�", 4,"涓村仠涓�")
;
String name;
--
Gitblit v1.9.3