From d77aa9268ed02e7bda8a67aab2213e42cb5afcf4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 08 六月 2023 13:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

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

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THtmlController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THtmlController.java
index 9f27ad3..cb6cd19 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THtmlController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THtmlController.java
@@ -108,7 +108,7 @@
     public String startingFareExplain(Model model) {
         THtml html = queryHtmlByType(HtmlTypeEnum.SPECIFICATION_STARTING_PRICE.getCode());
         model.addAttribute("html",html);
-        return PREFIX + "estimatedPriceExplain.html";
+        return PREFIX + "startingFareExplain.html";
     }
 
     /**

--
Gitblit v1.7.1