Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-16 4e8951a439c03e87568789cedeb62033884412db

 management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html

@@ -105,7 +105,7 @@
                     <div id="noVipUnlockDiv" class="flex-div">
                        <div class="sp-hidden flex-div noVipUnlockTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
                           <input type="text" id="noVipUnlockTime" class="form-control layer-date " >
                           <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="noVipUnlockSubmit()"/>
                           <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="noVipUnlockSubmit()"/>
                        </div>
                        <div class="noVipUnlockTimes flex-div"  style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
                           <span class="active sp-item">今日</span>
@@ -128,7 +128,7 @@
                     <div id="vipUnlockDiv" class="flex-div">
                        <div class="sp-hidden flex-div vipUnlockTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
                           <input type="text" id="vipUnlockTime" class="form-control layer-date " >
                           <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="vipUnlockSubmit()"/>
                           <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="vipUnlockSubmit()"/>
                        </div>
                        <div class="vipUnlockTimes flex-div"  style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
                           <span class="active sp-item">今日</span>
@@ -151,7 +151,7 @@
                     <div id="allIncomeDiv" class="flex-div">
                        <div class="sp-hidden flex-div allIncomeTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
                           <input type="text" id="allIncomeTime" class="form-control layer-date " >
                           <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="allIncomeSubmit()"/>
                           <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="allIncomeSubmit()"/>
                        </div>
                        <div class="allIncomeTimes flex-div"  style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
                           <span class="active sp-item">今日</span>
@@ -174,7 +174,7 @@
                     <div id="addVipDiv" class="flex-div">
                        <div class="sp-hidden flex-div addVipTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
                           <input type="text" id="addVipTime" class="form-control layer-date " >
                           <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="addVipSubmit()"/>
                           <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="addVipSubmit()"/>
                        </div>
                        <div class="addVipTimes flex-div"  style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
                           <span class="active sp-item">今日</span>
@@ -197,7 +197,7 @@
                     <div id="sendActiveDiv" class="flex-div">
                        <div class="sp-hidden flex-div sendActiveTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
                           <input type="text" id="sendActiveTime" class="form-control layer-date " >
                           <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="sendActiveSubmit()"/>
                           <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="sendActiveSubmit()"/>
                        </div>
                        <div class="sendActiveTimes flex-div"  style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
                           <span class="active sp-item">今日</span>
@@ -230,7 +230,7 @@
                     <div id="userDiv" class="flex-div">
                        <div class="sp-hidden flex-div userTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
                           <input type="text" id="userTime" class="form-control layer-date " >
                           <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="userSubmit()"/>
                           <#button style="margin: 0;" btnCs="info" name="查询" id="ensure" icon="fa-check" clickFun="userSubmit()"/>
                        </div>
                        <div class="userTimes flex-div"  style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
                           <span class="active sp-item">今日</span>