From 5a56fe238e5f51efe5221b5a376f109cda4b4b72 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 01 六月 2023 23:29:11 +0800
Subject: [PATCH] Merge branch '1.1' of http://sinata.cn:10101/gitblit/r/java/SuperSaveDriving into 1.1

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/enums/HtmlTypeEnum.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/enums/HtmlTypeEnum.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/enums/HtmlTypeEnum.java
index 9656da2..0285c97 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/enums/HtmlTypeEnum.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/enums/HtmlTypeEnum.java
@@ -18,7 +18,7 @@
     COMMISSION_RULE_EXPLAIN(5, "佣金规则说明"),
     TRIP_RECORDING_EXPLAIN(6, "行程录音说明"),
     ESTIMATED_PRICE_EXPLAIN(7,"预估价格说明"),
-    basic_requirements_joining(8, "加盟基本要求"),
+    BASIC_REQUIREMENTS_JOINING(8, "加盟基本要求"),
     JOINING_PROCESS(9, "加盟流程"),
     SPECIFICATION_STARTING_PRICE(10, "起步价说明"),
     CANCELLATION_AGREEMENT(11,"注销协议"),

--
Gitblit v1.7.1