...
|
...
|
@@ -49,15 +49,6 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="listing.html" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="420">
|
|
|
<caret line="47" column="44" lean-forward="true" selection-start-line="47" selection-start-column="44" selection-end-line="47" selection-end-column="44" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
...
|
...
|
@@ -76,7 +67,7 @@ |
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="357">
|
|
|
<caret line="25" column="32" lean-forward="true" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
|
|
|
<caret line="25" column="59" selection-start-line="25" selection-start-column="59" selection-end-line="25" selection-end-column="59" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -270,7 +261,7 @@ |
|
|
<workItem from="1535514127808" duration="727000" />
|
|
|
<workItem from="1535532970259" duration="2527000" />
|
|
|
<workItem from="1535546044129" duration="20814000" />
|
|
|
<workItem from="1535633001243" duration="4322000" />
|
|
|
<workItem from="1535633001243" duration="5034000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
|
|
<created>1535458170068</created>
|
...
|
...
|
@@ -566,11 +557,25 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535637704890</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="43" />
|
|
|
<task id="LOCAL-00043" summary="登录处理">
|
|
|
<created>1535637833495</created>
|
|
|
<option name="number" value="00043" />
|
|
|
<option name="presentableId" value="LOCAL-00043" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535637833495</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00044" summary="登录处理">
|
|
|
<created>1535638014265</created>
|
|
|
<option name="number" value="00044" />
|
|
|
<option name="presentableId" value="LOCAL-00044" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535638014265</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="45" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="58774000" />
|
|
|
<option name="totallyTimeSpent" value="59486000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -617,9 +622,6 @@ |
|
|
<option name="LAST_COMMIT_MESSAGE" value="登录处理" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/api/database.php">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/api/command.php">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
...
|
...
|
@@ -903,10 +905,17 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="297">
|
|
|
<caret line="503" column="13" selection-start-line="503" selection-start-column="13" selection-end-line="503" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="357">
|
|
|
<caret line="25" column="32" lean-forward="true" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
|
|
|
<caret line="25" column="59" selection-start-line="25" selection-start-column="59" selection-end-line="25" selection-end-column="59" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|