From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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..19fc6b4 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
@@ -206,18 +206,21 @@
public static final String CODE_PREFIX_vipAcctId = "32";
public static final String CODE_PREFIX_rssId = "33";
public static final String CODE_PREFIX_pfId = "34";
+ public static final String CODE_PREFIX_ARDRID = "35";
public static final String CODE_PREFIX_bankId = "74";
public static final String CODE_PREFIX_bondId = "76";
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
+ public static final String CODE_PREFIX_backId = "78";
+ public static final String CODE_PREFIX_monthId = "79";
+ public static final String CODE_PREFIX_xmlId = "79";
+ public static final String CODE_PREFIX_formId = "80";
+ public static final String CODE_PREFIX_dataId = "81";
+ public static final String CODE_PREFIX_tranId = "82";
/**
@@ -976,9 +979,9 @@
return result;
}
- public static String getUUID(){
+ public static String getUUID() {
UUID uuid = UUID.randomUUID();
- return uuid.toString();
+ return uuid.toString().replaceAll("-", "");
}
}
--
Gitblit v1.8.0