From 15fd776a22e816144f24e3281d92559fcd55e2c0 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 09 十二月 2023 10:59:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 consum-base/src/main/java/com/consum/base/core/type/MixType.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/core/type/MixType.java b/consum-base/src/main/java/com/consum/base/core/type/MixType.java
index ed2968c..7174114 100644
--- a/consum-base/src/main/java/com/consum/base/core/type/MixType.java
+++ b/consum-base/src/main/java/com/consum/base/core/type/MixType.java
@@ -14,7 +14,7 @@
     private final static Map<String, String> map = new HashMap<>();
 
     static {
-        // 鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
+        // 鍗曟嵁绫诲瀷 1閲囪喘2璋冩嫧3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾
         // 1=璋冨锛�2=璋冨噺
         //1閲囪喘鍏ュ簱
         map.put("1" + "1", "1");

--
Gitblit v1.9.1