From 2e3adf807c3c198746d3d51fbab4d71bdf22af81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 十一月 2023 10:14:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 4aace47..cacca62 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
@@ -27,6 +27,7 @@
public static final String DINGDING ="DINGDING" ;
public static final String MINI_PROGRAMME ="MINI_PROGRAMME" ;
public static final String FREE_RENT_TIME ="FREE_RENT_TIME" ;
+ public static final String ACCESS_TOKEN ="ACCESS_TOKEN" ;
public static final String IMG_DIR = "IMG_DIR";
public static final String FILE_DIR ="FILE_DIR" ;
public static final String PRIVATE_KEY = "PRIVATE_KEY";
@@ -88,11 +89,11 @@
//浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾 1缁撶畻瀹為檯娑堣垂 2缁撶畻閫�娆� 3骞冲彴閫�娆�"
DEPOSIT(0,"绉熻溅鎶奸噾", "绉熻溅鎶奸噾"),
- CONSUMPTION(1,"缁撶畻瀹為檯娑堣垂", "缁撶畻瀹為檯娑堣垂"),
+ CONSUMPTION(1,"璁㈠崟娑堣垂缁撶畻", "璁㈠崟娑堣垂缁撶畻"),
- REFUND(2,"缁撶畻閫�娆�", "缁撶畻閫�娆�"),
+ REFUND(2,"缁撶畻閫�鎶奸噾", "缁撶畻閫�鎶奸噾"),
- PLATFORMREFUND(3,"骞冲彴閫�娆�", "骞冲彴閫�娆�")
+ PLATFORMREFUND(3,"骞冲彴閫�鎶奸噾", "骞冲彴閫�鎶奸噾")
;
String name;
@@ -335,13 +336,13 @@
public enum REFUND_TYPE{
// '閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆�'
- NORMAL( 0,"鐢ㄦ埛缁撶畻閫�娆�",""),
+ NORMAL( 0,"鐢ㄦ埛缁撶畻閫�娆�","缁撶畻閫�鎶奸噾"),
- PLAT_AUTO( 1,"骞冲彴鑷姩缁撶畻閫�娆�",""),
+ PLAT_AUTO( 1,"骞冲彴鑷姩缁撶畻閫�娆�","骞冲彴閫�鎶奸噾"),
- PLAT_FORCE( 2,"寮哄埗缁撶畻閫�娆�",""),
+ PLAT_FORCE( 2,"寮哄埗缁撶畻閫�娆�","骞冲彴閫�鎶奸噾"),
- BACK( 3,"缁撶畻鍚庨��娆�",""),
+ BACK( 3,"缁撶畻鍚庨��娆�","骞冲彴閫�娆�"),
;
String name;
--
Gitblit v1.9.3