Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-16 4e8951a439c03e87568789cedeb62033884412db

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

@@ -24,26 +24,26 @@
                                </select>
                            </div>-->
                            <div class="col-sm-2">
                                <select class="input-group" id="score" style="width: 120px;height: 33px" name="score">
                                    <option value="">选择分数</option>
                                    <option value="1">非常差</option>
                                    <option value="2">差</option>
                                    <option value="3">一般</option>
                                    <option value="4">满意</option>
                                    <option value="5">非常满意</option>
                                </select>
                                <#SelectCon id="score" name="评价分数" >
                                <option value="">选择分数</option>
                                <option value="1">非常差</option>
                                <option value="2">差</option>
                                <option value="3">一般</option>
                                <option value="4">满意</option>
                                <option value="5">非常满意</option>
                            </#SelectCon>
                            </div>
                            <div class="col-sm-2">
                                <#button name="搜索" icon="fa-search" clickFun="TEvaluate.search()"/>
                                <#button name="查询" icon="fa-search" clickFun="TEvaluate.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="TEvaluate.resetSearch()" space="true"/>
                            </div>
                            <div class="col-sm-12">
                                @if(shiro.hasPermission("/tEvaluate/export")){
                                <#button name="导出" icon="" clickFun="TEvaluate.export()"/>
                                @}
                            </div>
                        </div>
                        <div class="hidden-xs" id="TEvaluateTableToolbar" role="group">
                            @if(shiro.hasPermission("/tEvaluate/export")){
                            <#button name="导出" icon="" clickFun="TEvaluate.export()"/>
                            @}
                            @if(shiro.hasPermission("/tEvaluate/add")){
                                <#button name="添加" icon="fa-plus" clickFun="TEvaluate.openAddTEvaluate()"/>
                            @}