From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict

---
 zq-erp/src/main/java/com/matrix/system/hive/service/CodeService.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/CodeService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/CodeService.java
index fefb430..13508db 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/CodeService.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/CodeService.java
@@ -24,6 +24,17 @@
 	* @throws
 	 */
 	public String getOrderCode();
+
+	String get32LenNumberCode();
+
+	public String getFlowCode();
+	/**
+	 * 生成一个加上typeName前缀的编号
+	 *    typeName+时间戳+四位随机数
+	 * @param typeName
+	 * @return
+	 */
+	public String getCodeByTyle(String typeName);
 	
 	/**
 	*  根据一定的规则返回一个随机编号。

--
Gitblit v1.9.1