Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 a1557f3f07287c86e8a4a408f03ba19993e5a48c

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

@@ -48,7 +48,7 @@

        <div class="form-horizontal" id="carInfoForm">


            @if(type==1){
            <div class="form-group"   >
                <label class="col-sm-3 control-label">所属运营商：</label>
                <div class="col-sm-9">
@@ -61,8 +61,6 @@
                    <input type="checkbox" value="0" name="pt" onchange="TCarInfoDlg.oneChangeYys(this)">平台</input>
                </div>
            </div>


            <div class="form-group" id="provinceCode">
                <label class="col-sm-3 control-label">所在省：</label>
                <div class="col-sm-9">
@@ -70,10 +68,6 @@
                    </select>
                </div>
            </div>




            <div class="form-group" id="cityCode">
                <label class="col-sm-3 control-label">举办市：</label>
                <div class="col-sm-9">
@@ -82,6 +76,7 @@
                    </select>
                </div>
            </div>
            @}
            <div class="form-group" id="shop">
                <label class="col-sm-3 control-label">举办门店：</label>
                <div class="col-sm-9">