From 1d3134d07c0351bdcc35e58a585c6d6e78571a94 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 08 三月 2024 17:39:15 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html | 2 + cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java | 2 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js | 3 + cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html | 5 ++ cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java | 4 +- cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_edit.html | 2 - cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js | 2 cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 7 --- cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js | 8 +++ cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 31 ++++++++++++--- cloud-server-other/src/main/java/com/dsh/other/entity/Site.java | 8 +-- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 11 ++--- cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java | 5 ++ cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js | 2 + cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java | 4 +- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java | 4 + cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 2 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 4 +- cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 6 ++- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 2 cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_add.html | 2 - cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html | 2 22 files changed, 73 insertions(+), 45 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java index 177c8c0..011e972 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java @@ -27,6 +27,11 @@ @TableField("storeId") private Integer storeId; /** + * 是否可预约 + */ + @TableField("isCanBeBooked") + private Integer isCanBeBooked; + /** * 场地名称 */ @TableField("name") diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java index e5c79f1..e9a69b7 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java +++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java @@ -88,8 +88,8 @@ List<Map<String, Object>> querySiteListOfpage(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("operatorId") Integer operatorId, - @Param("storeName") String storeName, - @Param("page") Page<Map<String, Object>> page); + @Param("storeName") String storeName + ); } diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java index 1fe189b..0023ad3 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java @@ -225,8 +225,7 @@ // 筛选这个运营商下的门店 operatorId = UserExt.getUser().getObjectId(); } - Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(); - List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,page); + List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName); if (storeList.size() > 0 ){ for (Map<String, Object> stringObjectMap : storeList) { String provinceName = (String) stringObjectMap.get("province"); @@ -234,16 +233,14 @@ stringObjectMap.put("provinceCity",provinceName+cityName); Integer managerId = (Integer) stringObjectMap.get("operatorId"); if (managerId == null){ - stringObjectMap.put("accountName","平台"); + stringObjectMap.put("account","平台"); }else{ if (managerId==0){ - stringObjectMap.put("accountName","平台"); + stringObjectMap.put("account","平台"); }else{ TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId)); if (ToolUtil.isNotEmpty(operator)){ - stringObjectMap.put("accountName",operator.getName()); - }else{ - stringObjectMap.put("accountName","平台"); + stringObjectMap.put("account",operator.getName()); } } } diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java index 2d955d3..2d20e65 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java @@ -101,13 +101,14 @@ .eq("operatorId", 0) .ne("state", 3)); model.addAttribute("storeList",list); + model.addAttribute("operatorId",0); } if (UserExt.getUser().getObjectType()==2){ List<TStore> list2 = storeService.list(new QueryWrapper<TStore>() .eq("operatorId", UserExt.getUser().getObjectId()) .ne("state", 3)); model.addAttribute("storeList",list2); - model.addAttribute("operatorId",UserExt.getUser().getObjectId()); + model.addAttribute("operatorId",0); } if (UserExt.getUser().getObjectType()==3){ List<TStore> list3 = new ArrayList<>(); @@ -246,6 +247,7 @@ .eq("storeId", byId.getStoreId()) .ne("state",3)); model.addAttribute("siteList",siteList); + model.addAttribute("operatorId",byId.getOperatorId()); } if (UserExt.getUser().getObjectType()==2){ List<TStore> list2 = storeService.list(new QueryWrapper<TStore>() diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java index 51ed32e..5800575 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java @@ -561,10 +561,10 @@ } } } - + // 判断所选场地是否一个运营商 if (StringUtils.hasLength(sites)){ Integer oid=null; - String[] split = storeIds.split(","); + String[] split = sites.split(","); for (int i = 0; i < split.length; i++) { if(i==0){ Integer operatorId = siteService.getById(split[0]).getOperatorId(); diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java index 0e5b648..d80850d 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java @@ -422,7 +422,11 @@ model.addAttribute("c8",c8); model.addAttribute("id",id); StoreConfig c9 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,9)); - model.addAttribute("c9",c9); + if (c9==null){ + model.addAttribute("c9",new StoreConfig()); + }else{ + model.addAttribute("c9",c9); + } return PREFIX + "TShop_imgAll.html"; } @@ -744,12 +748,27 @@ } private StoreConfig collect(Integer id,Integer sort,Integer isOpen,String img,int type){ - StoreConfig one = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType, type)); - one.setSort(sort); - one.setIsOpen(isOpen); - if(ToolUtil.isNotEmpty(img)){ - one.setBackgroundImage(img); + StoreConfig one = storeConfigService.getOne(new QueryWrapper<StoreConfig>() + .eq("storeId", id) + .eq("type", type)); + if (one!=null){ + one.setSort(sort); + one.setIsOpen(isOpen); + if(ToolUtil.isNotEmpty(img)){ + one.setBackgroundImage(img); + } } + if (one == null){ + StoreConfig storeConfig = new StoreConfig(); + storeConfig.setStoreId(id); + storeConfig.setType(type); + storeConfig.setIsOpen(isOpen); + storeConfig.setSort(sort); + storeConfig.setBackgroundImage(img); + storeConfigService.save(storeConfig); + return storeConfig; + } + return one; } @RequestMapping(value = "/oneChangeNext") diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java index 904f26c..a7e4c49 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java @@ -216,7 +216,7 @@ @RequestMapping("/list") @ResponseBody public List<Game> changelist(BallQueryDto ballQueryDto) { -System.out.println("=======ballQueryDto=========="+ballQueryDto); + System.out.println("=======ballQueryDto=========="+ballQueryDto); User user = UserExt.getUser(); ballQueryDto.setType(user.getObjectType()); ballQueryDto.setId(user.getObjectId()); diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java index e984f83..ed97bff 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java @@ -83,6 +83,6 @@ List<Map<String, Object>> listStoreAllByIds(List<Integer> ids); - List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page); + List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName); } diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java index 4bc5fd2..69cdb47 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java @@ -30,8 +30,8 @@ } @Override - public List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page) { - return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName,page); + public List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName) { + return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName); } /** diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml index 3dae29d..0fbec6a 100644 --- a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml +++ b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml @@ -36,7 +36,9 @@ <select id="listAll" resultType="com.dsh.guns.modular.system.model.TStoreListVo"> select t1.*,t2.name userName,t2.phone userPhone,t3.name yysName - from t_store t1 left join sys_user t2 on t1.storeStaffId = t2.id left join t_operator t3 on t1.operatorId = t3.id + from t_store t1 + left join sys_user t2 on t1.storeStaffId = t2.id + left join t_operator t3 on t1.operatorId = t3.id where 1=1 <if test="provinceCode !=null and provinceCode !=''"> and t1.provinceCode = #{provinceCode} @@ -175,7 +177,7 @@ SELECT t1.id, t1.operatorId, t1.province, t1.city, t2.name,t1.ids,t1.name as siteName from t_site t1 left join t_store t2 on t1.storeId =t2.id - where t1.state=1 and t2.state=1 + where t1.state=1 and t2.state=1 and t1.isCanBeBooked = 1 and t1.reservation=1 <if test="provinceCode != null and provinceCode!=''"> and t1.provinceCode = #{provinceCode} </if> diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html index 30e62ab..e5ae7fc 100644 --- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html +++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html @@ -228,7 +228,10 @@ console.log(res) if (oneId == "1"){ res.innerHTML ="推荐像素:780x472px"; - }else{ + }else if (oneId == "6" || oneId == "7") { + res.innerHTML ="推荐像素:宽780px,高不限制"; + } + else{ res.innerHTML ="推荐像素:780x440px"; } console.log(oneId) diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html index 3f374b1..d57394f 100644 --- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html +++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html @@ -60,6 +60,8 @@ <option value="2" ${data.position == 2 ? 'selected=selected' : ''}>线上课得积分</option> <option value="3" ${data.position == 3 ? 'selected=selected' : ''}>看视频得奖励</option> <option value="4" ${data.position == 4 ? 'selected=selected' : ''}>常见问题</option> + <option value="6" ${data.position == 6 ? 'selected=selected' : ''}>社区世界杯顶部banner</option> + <option value="7" ${data.position == 7 ? 'selected=selected' : ''}>社区世界杯底部banner</option> </select> </div> </div> diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_add.html index b9a9294..f1b32c2 100644 --- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_add.html +++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_add.html @@ -44,9 +44,7 @@ <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script> <div class="ibox float-e-margins"> <input hidden id="userType" value="${userType}"> - @if(userType!=1){ <input hidden id="operatorId" value="${operatorId}"> - @} @if(userType==3){ <input hidden id="storeId" value="${storeId}"> @} diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_edit.html index 0ec3e9d..13fe006 100644 --- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_edit.html +++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_edit.html @@ -45,9 +45,7 @@ <div class="ibox float-e-margins"> <input hidden id="userType" value="${userType}"> <input hidden id="id" value="${id}"> - @if(userType!=1){ <input hidden id="operatorId" value="${operatorId}"> - @} @if(userType==3){ <input hidden id="storeId" value="${storeId}"> @} diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html index f622916..dbff552 100644 --- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html +++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html @@ -3,7 +3,7 @@ <div class="col-sm-12"> <div class="ibox float-e-margins"> <div class="ibox-title"> - <h5>所在门店</h5> + <h5>所在场地</h5> </div> <div class="ibox-content"> <div class="row row-lg"> diff --git a/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js b/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js index dd36d09..d042a33 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js @@ -24,7 +24,7 @@ {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'}, {title: '广告类型', field: 'position', visible: true, align: 'center', valign: 'middle',width:'20%', formatter:function (data) { - return {1:"首页banner",2:"线上课得积分",3:"看视频得奖励",4:"常见问题"}[data] + return {1:"首页banner",2:"线上课得积分",3:"看视频得奖励",4:"常见问题",6:"社区世界杯顶部",7:"社区世界杯底部"}[data] } }, {title: '广告名称', field: 'name', visible: true, align: 'center', valign: 'middle'}, diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js index f8b2538..79d8665 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js @@ -17,8 +17,10 @@ {field: 'selectItem', checkbox: true}, {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'}, {title: '所在省市', field: 'provinceCity', visible: true, align: 'center', valign: 'middle'}, + {title: '所属运营商', field: 'account', visible: true, align: 'center', valign: 'middle'}, {title: '门店名称', field: 'name', visible: true, align: 'center', valign: 'middle'}, {title: '场地名称', field: 'siteName', visible: true, align: 'center', valign: 'middle'}, + {title: '闸机ids', field: 'ids', visible: true, align: 'center', valign: 'middle'}, ]; }; diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js index e9fd6df..40c0de1 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js @@ -117,7 +117,7 @@ function siteList1(){ var index = layer.open({ type: 2, - title: '门店列表', + title: '场地列表', area: ['80%', '80%'], //宽高 fix: false, //不固定 maxmin: true, diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js index 62f6cfe..417f463 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js @@ -494,6 +494,9 @@ var carPhoto = new $WebUpload("c8"); carPhoto.setUploadBarId("progressBar"); carPhoto.init(); + var carPhoto = new $WebUpload("c9"); + carPhoto.setUploadBarId("progressBar"); + carPhoto.init(); var carPhoto = new $WebUpload("img"); carPhoto.setUploadBarId("progressBar"); carPhoto.init(); diff --git a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js index 7c2af8b..038ec1a 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js @@ -46,6 +46,9 @@ let coverImg = $('#coverImg').val(); let homeBackdropImg = $('#homeBackdropImg').val(); let content = editor.getContent(); + if("" == registrationClosingTime){ + registrationClosingTime = null; + } if(null == name || '' == name){ Feng.error("请填写有效的比赛名称"); return @@ -209,6 +212,9 @@ let coverImg = $('#coverImg').val(); let homeBackdropImg = $('#homeBackdropImg').val(); let content = editor.getContent(); + if("" == registrationClosingTime){ + registrationClosingTime = null; + } if(null == name || '' == name){ Feng.error("请填写有效的比赛名称"); return @@ -411,7 +417,7 @@ }); - if(null != $('#id').val()){ + if(null != $('#id').val() && '' != $('#id').val()){ WorldCupInfo.stores = JSON.parse($('#storeInfo').val()); WorldCupInfo.initStore(); let lng = $('#longitude').val(); diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java index c2ac606..73b6c4e 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java +++ b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java @@ -89,25 +89,18 @@ }) public ResultUtil<List<TGameConfig>> queryGameList(Integer siteId, Integer storeId) { try { - Integer uid = tokenUtil.getUserIdFormRedis(); AppUser appUser = appUserClient.queryAppUser(uid); List<TGameConfig> tGameConfigs = new ArrayList<>(); - if (appUser.getAddUserId() == null) { - - List<SiteLock> lock = lockService.list(new QueryWrapper<SiteLock>().eq("siteId", siteId)); - Date now = new Date(); for (SiteLock siteLock : lock) { if (now.after(siteLock.getStartTime()) && now.before(siteLock.getEndTime())) { return ResultUtil.error("当前场地已被锁定"); } } - } - List<TGame> list = gameService.list(new LambdaQueryWrapper<TGame>().eq(TGame::getSiteId, siteId).eq(TGame::getStoreId, storeId).eq(TGame::getState, 0)); if (list.size() > 0) { Integer id = list.get(0).getId(); diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java index 6891cc2..867ce75 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java +++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java @@ -36,6 +36,8 @@ */ @TableField("siteTypeId") private Integer siteTypeId; + @TableField("isCanBeBooked") + private Integer isCanBeBooked; /** * 城市管理员id */ @@ -61,11 +63,7 @@ */ @TableField("cityCode") private String cityCode; - /** - * 是否可预约(0=否,1=是) - */ - @TableField("isCanBeBooked") - private Integer isCanBeBooked; + /** * 预约开始时间 */ -- Gitblit v1.7.1