Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

puzhibing

2024-03-08 3cc41ba03659e9e51f26865fe0d04cf43fbc68fb

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java

@@ -91,7 +91,16 @@
    @Autowired
    private IWorldCupPaymentService worldCupPaymentService;


    /**
     * 根据门店id获取门店关系数据
     * @param storeId
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/getWorldCupStoreListByStoreId")
    public List<WorldCupStore> getWorldCupStoreListByStoreId(@RequestBody Integer storeId){
        return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId));
    }


    @ResponseBody

 cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html

@@ -228,8 +228,6 @@
        console.log(res)
        if (oneId == "1"){
            res.innerHTML ="推荐像素:780x472px";
        }else if (oneId == "6" || oneId == "7") {
            res.innerHTML ="推荐像素:宽780px，高不限制";
        }
        else{
            res.innerHTML ="推荐像素:780x440px";