From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/shop/ChargeTypeEnum.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/shop/ChargeTypeEnum.java b/fanli/src/main/java/com/yeshi/fanli/entity/shop/ChargeTypeEnum.java
index bba4bbe..dcfc3ac 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/shop/ChargeTypeEnum.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/shop/ChargeTypeEnum.java
@@ -1,7 +1,7 @@
package com.yeshi.fanli.entity.shop;
public enum ChargeTypeEnum {
- qq("QQ鍙�", "璇疯緭鍏ュ父鐢≦Q鍙风爜鍏呭��"), phone("鎵嬫満鍙风爜", "璇疯緭鍏ュ父鐢ㄦ墜鏈哄彿");
+ qq("QQ", "璇疯緭鍏ュ父鐢≦Q鍙风爜鍏呭��"), phone("鎵嬫満鍙�", "璇疯緭鍏ュ父鐢ㄦ墜鏈哄彿");
private final String name;
private final String desc;
--
Gitblit v1.8.0