Merge remote-tracking branch 'origin/master'

nickchange

2023-11-15 951f90b82993acc835cdf58a9f1f39aeecd86674

 cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js

@@ -106,12 +106,18 @@
    console.log(111)
    var oneId=$(e).val();
    var elementById = document.getElementById("pt");

    var operatorId;
    if (elementById !== null) {
        console.log(elementById)
        operatorId =  $("#account").val()
    if (elementById.checked){
        operatorId = 0
    }else{
        operatorId =  $("#account").val()
    }
    }


    var ajax = new $ax(Feng.ctxPath + "/tShop/getCityYys", function(data){
        if(data!=null){
@@ -211,9 +217,6 @@
    if(!this.validate()){
        return ;
    }



    var pCode = $("#pCode").val();
    if(pCode==""){
        Feng.info("请选择省");