Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 a1557f3f07287c86e8a4a408f03ba19993e5a48c

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

@@ -11,6 +11,7 @@
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            @if(type==1){
                            <div class="col-sm-3">
                                <div class="input-group">
                                    <div class="input-group-btn open">
@@ -37,6 +38,7 @@
                                    </select>
                                </div>
                            </div>
                            @}
                            <div class="col-sm-3">
                                <#NameCon id="shopName" name="门店名称" />
                            </div>