Merge remote-tracking branch 'origin/master'

nickchange

2023-11-14 a1d261d6c92c38d9e496e11d1bc224ecc1d34798

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetitionUser.html

@@ -23,7 +23,7 @@
                    </div>
                </div>
                <div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
                    <#button name="导出" icon="fa-plus" clickFun="TCompetition.export()"/>
                    <#button name="导出" icon="fa-plus" clickFun="TCompetition.ouTCompetition()"/>
                </div>
                <#table id="TCompetitionTable"/>
            </div>