Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai into develop-wxl

# Conflicts:
#	target/classes/com/template/api/HouseNumberStateAPI.class
#	target/classes/com/template/controller/HouseNumberStateController.class
#	target/classes/com/template/controller/HouseOrderController.class
#	target/classes/com/template/model/dto/ApartmentSettingDto.class
#	target/classes/com/template/model/pojo/ApartmentSetting.class
#	target/classes/com/template/model/vo/ApartmentSettingVo.class
#	target/mybatis_plus-0.0.1-SNAPSHOT.jar
#	target/mybatis_plus-0.0.1-SNAPSHOT.jar.original

.idea/workspace.xml

@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="42a0d34b-c484-4704-92dd-be5ac61d2f66" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ParticularHouseNumberStatusVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ParticularHouseNumberStatusVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CodeInsightWorkspaceSettings">
-    <option name="optimizeImportsOnTheFly" value="true" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Interface" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/soft/maven/apache-maven-3.8.6" />
-        <option name="userSettingsFile" value="D:\soft\maven\apache-maven-3.8.6\conf\settings.xml" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenRunner">
-    <option name="skipTests" value="true" />
-  </component>
-  <component name="ProblemsViewState">
-    <option name="selectedTabId" value="CurrentFile" />
-  </component>
-  <component name="ProjectId" id="2YHd6TDRlyqYh3OC9nI7fVxdhno" />
-  <component name="ProjectViewState">
-    <option name="showExcludedFiles" value="false" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
-    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
-    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
-    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;E:/2024project/iHotel_student_houtai&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
-    &quot;spring.configuration.checksum&quot;: &quot;f6966ce39847c3d9a18b4a1dfc3fec06&quot;
-  }
-}</component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\2024project\iHotel_student_houtai\src\main\resources" />
-      <recent name="E:\company\iHotel_student_houtai\src\main\java\com\template\common\utils" />
-      <recent name="E:\company\iHotel_student_houtai\src\main\java\com\template\model\weixin" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="E:\2024project\iHotel_student_houtai\src\main\resources\mapper\template" />
-      <recent name="E:\company\iHotel_student_houtai\src\main\resources\mapper\template" />
-      <recent name="E:\company\iHotel_student_houtai\src\main\resources\mapper" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.template.common.utils" />
-      <recent name="com.template.common.utils.weixin" />
-      <recent name="com.template.model.weixin" />
-      <recent name="com.template.config" />
-    </key>
-  </component>
-  <component name="RunDashboard">
-    <option name="configurationTypes">
-      <set>
-        <option value="SpringBootApplicationConfigurationType" />
-      </set>
-    </option>
-  </component>
-  <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
-    <configuration name="AesUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.template.common.utils.AesUtils" />
-      <module name="iHotel_student_houtai" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.template.common.utils.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="AppletLoginController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.template.controller.AppletLoginController" />
-      <module name="iHotel_student_houtai" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.template.controller.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="AutoCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.template.AutoCode" />
-      <module name="iHotel_student_houtai" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.template.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="DateTimeZoneUtil" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.template.model.weixin.DateTimeZoneUtil" />
-      <module name="iHotel_student_houtai" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.template.model.weixin.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="HouseOrderController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.template.controller.HouseOrderController" />
-      <module name="iHotel_student_houtai" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.template.controller.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="MybatisPlusApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
-      <option name="ACTIVE_PROFILES" />
-      <module name="iHotel_student_houtai" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.template.MybatisPlusApplication" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.template.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <list>
-      <item itemvalue="Application.AesUtils" />
-      <item itemvalue="Application.AppletLoginController" />
-      <item itemvalue="Application.DateTimeZoneUtil" />
-      <item itemvalue="Application.HouseOrderController" />
-      <item itemvalue="Application.AutoCode" />
-      <item itemvalue="Spring Boot.MybatisPlusApplication" />
-    </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Application.DateTimeZoneUtil" />
-        <item itemvalue="Application.AppletLoginController" />
-        <item itemvalue="Application.AesUtils" />
-        <item itemvalue="Application.HouseOrderController" />
-        <item itemvalue="Application.AutoCode" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="SpringBootOptions">
-    <option name="showAdditionalConfigNotification" value="false" />
-  </component>
-  <component name="SshConsoleOptionsProvider">
-    <option name="myEncoding" value="UTF-8" />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="42a0d34b-c484-4704-92dd-be5ac61d2f66" name="Changes" comment="" />
-      <created>1700186263832</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1700186263832</updated>
-      <workItem from="1700186265128" duration="1452000" />
-      <workItem from="1700187845025" duration="272442000" />
-      <workItem from="1701824578863" duration="148698000" />
-      <workItem from="1703235523569" duration="695000" />
-      <workItem from="1707035814786" duration="26000" />
-      <workItem from="1707125933388" duration="758000" />
-      <workItem from="1707127543620" duration="194000" />
-      <workItem from="1707183565887" duration="4060000" />
-      <workItem from="1708478601045" duration="43000" />
-      <workItem from="1708672733279" duration="19000" />
-      <workItem from="1708672767815" duration="12000" />
-      <workItem from="1708672786015" duration="3000" />
-      <workItem from="1708672802540" duration="50451000" />
-      <workItem from="1709263276404" duration="690000" />
-      <workItem from="1709272855362" duration="148572000" />
-      <workItem from="1710723486251" duration="146091000" />
-      <workItem from="1711501418779" duration="16617000" />
-      <workItem from="1711588157060" duration="32709000" />
-      <workItem from="1711935512322" duration="2237000" />
-      <workItem from="1711955623454" duration="111270000" />
-      <workItem from="1712711167230" duration="81261000" />
-      <workItem from="1713230566228" duration="80634000" />
-      <workItem from="1714016912493" duration="11299000" />
-      <workItem from="1714984629640" duration="102282000" />
-      <workItem from="1715826083663" duration="6440000" />
-      <workItem from="1716780091292" duration="1118000" />
-      <workItem from="1717117321985" duration="1228000" />
-      <workItem from="1717380643450" duration="6764000" />
-      <workItem from="1718351916607" duration="1852000" />
-      <workItem from="1718589597123" duration="9394000" />
-      <workItem from="1718790560373" duration="618000" />
-      <workItem from="1718855981011" duration="13620000" />
-      <workItem from="1719450617842" duration="1267000" />
-      <workItem from="1719468917857" duration="202000" />
-      <workItem from="1719803543119" duration="56881000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/ClassScheduleController.java</url>
-          <line>98</line>
-          <option name="timeStamp" value="15" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/ClassScheduleController.java</url>
-          <line>124</line>
-          <option name="timeStamp" value="16" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>562</line>
-          <option name="timeStamp" value="48" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>887</line>
-          <option name="timeStamp" value="50" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>652</line>
-          <option name="timeStamp" value="61" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>707</line>
-          <option name="timeStamp" value="62" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>671</line>
-          <option name="timeStamp" value="64" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/UsersMenuController.java</url>
-          <line>108</line>
-          <option name="timeStamp" value="72" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/common/utils/SubscribeSample.java</url>
-          <line>103</line>
-          <option name="timeStamp" value="129" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/common/utils/SubscribeSample.java</url>
-          <line>114</line>
-          <option name="timeStamp" value="130" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/common/utils/SubscribeSample.java</url>
-          <line>131</line>
-          <option name="timeStamp" value="131" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/common/utils/SubscribeSample.java</url>
-          <line>135</line>
-          <option name="timeStamp" value="132" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/UnlockingAdminController.java</url>
-          <line>112</line>
-          <option name="timeStamp" value="163" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/UnlockingAdminController.java</url>
-          <line>102</line>
-          <option name="timeStamp" value="166" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
-          <line>1856</line>
-          <option name="timeStamp" value="179" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
-          <line>1593</line>
-          <option name="timeStamp" value="181" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
-          <line>1697</line>
-          <option name="timeStamp" value="218" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/model/weixin/MyRestTempleteUtil.java</url>
-          <line>33</line>
-          <option name="timeStamp" value="224" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>435</line>
-          <option name="timeStamp" value="228" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>329</line>
-          <option name="timeStamp" value="231" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-    <watches-manager>
-      <configuration name="SpringBootApplicationConfigurationType">
-        <watch expression="housePrices" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/iHotel_student_houtai$SubscribeSample.ic" NAME="SubscribeSample Coverage Results" MODIFIED="1710380614726" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
-      <FILTER>com.template.common.utils.*</FILTER>
-    </SUITE>
-  </component>
-</project>

src/main/java/com/template/api/HouseNumberStateAPI.java

@@ -5,7 +5,6 @@ import com.template.model.pojo.LockRoomDto;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.CleanRoomDtos;
 import com.template.model.vo.DirtyRoomDtos;
-import com.tencentcloudapi.mrs.v20200910.models.Check;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -92,5 +91,7 @@ public interface HouseNumberStateAPI {
     @ApiOperation(value = "房态管理-批量开房", notes = "房态管理-批量开房", httpMethod = "POST")
     CommonResult openRooms(@RequestBody OpenRoomsDto openRoomsDto);
 
-
+    @GetMapping("/reserveHour")
+    @ApiOperation(value = "房态管理-管理端钟点房当天占用状态", notes = "房态管理-管理端钟点房当天占用状态", httpMethod = "GET")
+    CommonResult reserveHour(String houseNumberId, String startTime, String endTime, int adminId);
 }

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -1,40 +1,31 @@
 package com.template.controller;
 
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.HouseNumberStateAPI;
-import com.template.common.utils.AesUtils;
 import com.template.common.utils.DateUtil;
-import com.template.common.utils.HttpClientHelper;
-import com.template.common.utils.MD5;
 import com.template.component.WeiXiaoComponent;
 import com.template.config.DoorLockConfig;
 import com.template.model.dto.*;
-import com.template.model.enumModel.PasswordUrlEnum;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.*;
 import com.template.services.*;
-import org.apache.catalina.User;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.time.*;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1582,7 +1573,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         return CommonResult.ok();
     }
 
+    @Override
+    public CommonResult reserveHour(String houseNumberId, String startTime, String endTime, int adminId) {
+
 
+        return null;
+    }
 
 
 }

src/main/java/com/template/model/dto/ApartmentSettingDto.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
-import java.util.Date;
 
 @Data
 public class ApartmentSettingDto {
@@ -34,6 +33,9 @@ public class ApartmentSettingDto {
     @ApiModelProperty(value = "离店时间")
     private String leaveTime;
 
+    @ApiModelProperty(value = "钟点房可用时间段")
+    private String hourTime;
+
     @ApiModelProperty(value = "电话号码")
     private String phoneNumbr;
 

src/main/java/com/template/model/pojo/ApartmentSetting.java

@@ -1,19 +1,14 @@
 package com.template.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
@@ -55,6 +50,9 @@ public class ApartmentSetting implements Serializable {
     @ApiModelProperty(value = "离店时间")
     private String leaveTime;
 
+    @ApiModelProperty(value = "钟点房可用时间段")
+    private String hourTime;
+
     @ApiModelProperty(value = "电话号码")
     private String phoneNumbr;
 

src/main/java/com/template/model/vo/ApartmentSettingVo.java

@@ -3,9 +3,7 @@ package com.template.model.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 @Data
 public class ApartmentSettingVo {
@@ -32,6 +30,9 @@ public class ApartmentSettingVo {
     @ApiModelProperty(value = "离店时间")
     private String leaveTime;
 
+    @ApiModelProperty(value = "钟点房可用时间段")
+    private String hourTime;
+
     @ApiModelProperty(value = "电话号码")
     private String phoneNumbr;