Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 a1557f3f07287c86e8a4a408f03ba19993e5a48c

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

@@ -53,7 +53,7 @@
            <input hidden id="q3" value="${item.classPrice}">
            <input hidden id="rname" value="${item.realName}">
            <input hidden id="type" value="${item.status}">
            @if(type==2){
            @if(objectType==1){
            <#label  id="types" name="当前状态" type="text" />
            <div class="form-group" id="provinceCode">
                <label class="col-sm-3 control-label">举办省：</label>