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

无关风月

2 天以前 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

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

@@ -242,10 +242,9 @@
                    @}
                </div>
            </div>

            <div style="font-size: x-large;">赛事比赛板块</div>
            <div style="font-size: x-large; display: none" >赛事比赛板块</div>
            @for(obj in worldCupStores){
            <div class="row">
            <div class="row " style="display: none" >
                <input hidden name="cupId" value="${obj.id}">
                <input hidden name="backgroundImage" value="${obj.backgroundImage}">
                <input hidden name="isOpen" value="${obj.isOpen}">