|
@@ -49,15 +49,6 @@ |
|
@@ -49,15 +49,6 @@ |
49
|
</provider>
|
49
|
</provider>
|
50
|
</entry>
|
50
|
</entry>
|
51
|
</file>
|
51
|
</file>
|
52
|
- <file leaf-file-name="listing.html" pinned="false" current-in-tab="false">
|
|
|
53
|
- <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
|
|
|
54
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
55
|
- <state relative-caret-position="420">
|
|
|
56
|
- <caret line="47" column="44" lean-forward="true" selection-start-line="47" selection-start-column="44" selection-end-line="47" selection-end-column="44" />
|
|
|
57
|
- </state>
|
|
|
58
|
- </provider>
|
|
|
59
|
- </entry>
|
|
|
60
|
- </file>
|
|
|
61
|
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
|
52
|
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
|
62
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
|
53
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
|
63
|
<provider selected="true" editor-type-id="text-editor">
|
54
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -76,7 +67,7 @@ |
|
@@ -76,7 +67,7 @@ |
76
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
67
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
77
|
<provider selected="true" editor-type-id="text-editor">
|
68
|
<provider selected="true" editor-type-id="text-editor">
|
78
|
<state relative-caret-position="357">
|
69
|
<state relative-caret-position="357">
|
79
|
- <caret line="25" column="32" lean-forward="true" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
|
70
|
+ <caret line="25" column="59" selection-start-line="25" selection-start-column="59" selection-end-line="25" selection-end-column="59" />
|
80
|
</state>
|
71
|
</state>
|
81
|
</provider>
|
72
|
</provider>
|
82
|
</entry>
|
73
|
</entry>
|
|
@@ -270,7 +261,7 @@ |
|
@@ -270,7 +261,7 @@ |
270
|
<workItem from="1535514127808" duration="727000" />
|
261
|
<workItem from="1535514127808" duration="727000" />
|
271
|
<workItem from="1535532970259" duration="2527000" />
|
262
|
<workItem from="1535532970259" duration="2527000" />
|
272
|
<workItem from="1535546044129" duration="20814000" />
|
263
|
<workItem from="1535546044129" duration="20814000" />
|
273
|
- <workItem from="1535633001243" duration="4322000" />
|
264
|
+ <workItem from="1535633001243" duration="5034000" />
|
274
|
</task>
|
265
|
</task>
|
275
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
266
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
276
|
<created>1535458170068</created>
|
267
|
<created>1535458170068</created>
|
|
@@ -566,11 +557,25 @@ |
|
@@ -566,11 +557,25 @@ |
566
|
<option name="project" value="LOCAL" />
|
557
|
<option name="project" value="LOCAL" />
|
567
|
<updated>1535637704890</updated>
|
558
|
<updated>1535637704890</updated>
|
568
|
</task>
|
559
|
</task>
|
569
|
- <option name="localTasksCounter" value="43" />
|
560
|
+ <task id="LOCAL-00043" summary="登录处理">
|
|
|
561
|
+ <created>1535637833495</created>
|
|
|
562
|
+ <option name="number" value="00043" />
|
|
|
563
|
+ <option name="presentableId" value="LOCAL-00043" />
|
|
|
564
|
+ <option name="project" value="LOCAL" />
|
|
|
565
|
+ <updated>1535637833495</updated>
|
|
|
566
|
+ </task>
|
|
|
567
|
+ <task id="LOCAL-00044" summary="登录处理">
|
|
|
568
|
+ <created>1535638014265</created>
|
|
|
569
|
+ <option name="number" value="00044" />
|
|
|
570
|
+ <option name="presentableId" value="LOCAL-00044" />
|
|
|
571
|
+ <option name="project" value="LOCAL" />
|
|
|
572
|
+ <updated>1535638014265</updated>
|
|
|
573
|
+ </task>
|
|
|
574
|
+ <option name="localTasksCounter" value="45" />
|
570
|
<servers />
|
575
|
<servers />
|
571
|
</component>
|
576
|
</component>
|
572
|
<component name="TimeTrackingManager">
|
577
|
<component name="TimeTrackingManager">
|
573
|
- <option name="totallyTimeSpent" value="58774000" />
|
578
|
+ <option name="totallyTimeSpent" value="59486000" />
|
574
|
</component>
|
579
|
</component>
|
575
|
<component name="ToolWindowManager">
|
580
|
<component name="ToolWindowManager">
|
576
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
581
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -617,9 +622,6 @@ |
|
@@ -617,9 +622,6 @@ |
617
|
<option name="LAST_COMMIT_MESSAGE" value="登录处理" />
|
622
|
<option name="LAST_COMMIT_MESSAGE" value="登录处理" />
|
618
|
</component>
|
623
|
</component>
|
619
|
<component name="editorHistoryManager">
|
624
|
<component name="editorHistoryManager">
|
620
|
- <entry file="file://$PROJECT_DIR$/api/database.php">
|
|
|
621
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
622
|
- </entry>
|
|
|
623
|
<entry file="file://$PROJECT_DIR$/api/command.php">
|
625
|
<entry file="file://$PROJECT_DIR$/api/command.php">
|
624
|
<provider selected="true" editor-type-id="text-editor" />
|
626
|
<provider selected="true" editor-type-id="text-editor" />
|
625
|
</entry>
|
627
|
</entry>
|
|
@@ -903,10 +905,17 @@ |
|
@@ -903,10 +905,17 @@ |
903
|
</state>
|
905
|
</state>
|
904
|
</provider>
|
906
|
</provider>
|
905
|
</entry>
|
907
|
</entry>
|
|
|
908
|
+ <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
|
|
|
909
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
910
|
+ <state relative-caret-position="297">
|
|
|
911
|
+ <caret line="503" column="13" selection-start-line="503" selection-start-column="13" selection-end-line="503" selection-end-column="13" />
|
|
|
912
|
+ </state>
|
|
|
913
|
+ </provider>
|
|
|
914
|
+ </entry>
|
906
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
915
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
907
|
<provider selected="true" editor-type-id="text-editor">
|
916
|
<provider selected="true" editor-type-id="text-editor">
|
908
|
<state relative-caret-position="357">
|
917
|
<state relative-caret-position="357">
|
909
|
- <caret line="25" column="32" lean-forward="true" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
|
918
|
+ <caret line="25" column="59" selection-start-line="25" selection-start-column="59" selection-end-line="25" selection-end-column="59" />
|
910
|
</state>
|
919
|
</state>
|
911
|
</provider>
|
920
|
</provider>
|
912
|
</entry>
|
921
|
</entry>
|