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

无关风月

1 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java

@@ -65,9 +65,9 @@
        try {
            List<StoreConfig> list = storeConfigService.list(new QueryWrapper<StoreConfig>().eq("storeId", storeId)
                    .orderByAsc("sort").eq("isOpen", 1));
            HomeModule homeModule = homeModuleService.getOne(new QueryWrapper<HomeModule>().eq("isOpen", 1));
            List<HomeModule> homeModules = homeModuleService.list(new QueryWrapper<HomeModule>().eq("isOpen", 1).eq("storeId",storeId));
            List<StoreConfigVo> listVo = new ArrayList<>();
            if(null != homeModule){
            for (HomeModule homeModule : homeModules) {
                StoreConfigVo vo = new StoreConfigVo();
                vo.setType(0);
                vo.setIsOpen(homeModule.getIsOpen());