From 765a807994acc6190208b68718680280ee577196 Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Fri, 14 Feb 2025 08:14:49 +0800
Subject: [PATCH] 'commit'

---
 dsBase/.idea/misc.xml                              | 1 +
 dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html | 2 +-
 dsBaseWeb/ds-base/html/pages/ylt/occupy/set.html   | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dsBase/.idea/misc.xml b/dsBase/.idea/misc.xml
index 158c04b5..4f362949 100644
--- a/dsBase/.idea/misc.xml
+++ b/dsBase/.idea/misc.xml
@@ -7,6 +7,7 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html b/dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html
index d1bde54d..dd8873e9 100644
--- a/dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html
+++ b/dsBaseWeb/ds-base/html/pages/ylt/occupy/index.html
@@ -138,7 +138,7 @@
                         { title: '序号', align: 'center', width: "5%", type: 'numbers' },
                         { title: '场站名称', field: 'station_name', align: 'left' },
                         { title: '状态', align: 'center', templet: '#status', width: "10%" },
-                        { title: '每小时收费金额(元)', field: 'one_hour_money', align: 'center', width: "15%" },
+                        { title: '每分钟收费金额(元)', field: 'one_minute_money', align: 'center', width: "15%" },
                         { title: '免费时长(分钟)', field: 'free_duration', align: 'center', width: "15%" },
                         { title: '占位费上限金额(元)', field: 'money_limit', align: 'center', width: "15%" },                        
                         { title: '操作', toolbar: '#table-bar', align: 'center', width: "10%" }
diff --git a/dsBaseWeb/ds-base/html/pages/ylt/occupy/set.html b/dsBaseWeb/ds-base/html/pages/ylt/occupy/set.html
index c71b07e4..55659d71 100644
--- a/dsBaseWeb/ds-base/html/pages/ylt/occupy/set.html
+++ b/dsBaseWeb/ds-base/html/pages/ylt/occupy/set.html
@@ -61,10 +61,10 @@
 
         <div class="main-container">
             <div class="layui-form-item">
-                <label class="layui-form-label label-width"><span class="require-star"></span>每小时收费金额(元)</label>
+                <label class="layui-form-label label-width"><span class="require-star"></span>每分钟收费金额(元)</label>
                 <div class="layui-form-item layui-inline">
-                    <input type="text" id="one_hour_money" name="one_hour_money" autocomplete="off"
-                        lay-verify="required|number" placeholder="请输入每小时收费金额" class="layui-input input-width">
+                    <input type="text" id="one_minute_money" name="one_minute_money" autocomplete="off"
+                        lay-verify="required|number" placeholder="请输入每分钟收费金额" class="layui-input input-width">
                 </div>
             </div>
             <div class="layui-form-item">
@@ -114,7 +114,7 @@
                 data: { station_id: id },
                 success: function (res) {
                     if (res.success) {
-                        $("#one_hour_money").val(res.one_hour_money);
+                        $("#one_minute_money").val(res.one_minute_money);
                         $("#free_duration").val(res.free_duration);
                         $("#money_limit").val(res.money_limit);
                     }