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

luofl

2025-04-11 a9edc2f62628007e2c5e86d416d484780238f13f

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminAgreement/tHuiminAgreement_add.html

@@ -29,7 +29,9 @@
                    <label class="col-sm-1 control-label" for="operator">所属运营商：</label>
                    <div class="col-sm-3">
                        <select id="operator" class="form-control">
                            @if(objectType == 1){
                            <option value="">默认</option>
                            @}
                            @if(isNotEmpty(operatorList)){
                            @for(item in operatorList){
                                @if(objectType == 2){