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

puzhibing

2024-03-11 aa8afb8f18fee21361742b62061b4d4db4a09bb5

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java

@@ -130,8 +130,6 @@
            .ne("state",3));
            model.addAttribute("siteList",siteList);
        }


        return PREFIX + "gate_add.html";
    }

@@ -310,10 +308,8 @@
        List<Map<String,Object>> res = gateService.listAll(name,device,operatorName,storeName,storeIds,page);
        return res;
    }

    /**
     * 根据运营商id获取门店列表

     */
    @RequestMapping(value = "/getStore")
    @ResponseBody