From ab4a935e57fea1066146e48c09476a9314a175ff Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期五, 06 八月 2021 13:05:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java b/java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
index df4568e..7b770fd 100644
--- a/java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
@@ -211,12 +211,11 @@
public static final String CODE_PREFIX_bobjId = "77";
public static final String CODE_PREFIX_smsId = "78";
public static final String CODE_PREFIX_adsId = "78";
-<<<<<<< HEAD
public static final String CODE_PREFIX_userAnId = "88";
public static final String CODE_PREFIX_anValueId = "68";
-=======
+
public static final String CODE_PREFIX_backId = "78";
->>>>>>> 7e621d56f2efc96f42a47ba3e5a62af69c6dd043
+
--
Gitblit v1.8.0