Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html

@@ -69,7 +69,7 @@
                    @}
                    <#button name="免费福利" icon="fa-remove" clickFun="TCompetition.gift()" space="true"/>
                    <#button name="首页设置" icon="fa-remove" clickFun="TCompetition.indexSet()" space="true"/>
                    

                    @if(role == '1'){
                        @if(shiro.hasPermission("/tHomeModule/tHomeModule_platformSet")){
                        <#button name="图文模块设置" icon="fa-edit" clickFun="TCompetition.platformSet()" space="true"/>