|
@@ -75,8 +75,8 @@ |
|
@@ -75,8 +75,8 @@ |
75
|
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
|
75
|
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
|
76
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
76
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
77
|
<provider selected="true" editor-type-id="text-editor">
|
77
|
<provider selected="true" editor-type-id="text-editor">
|
78
|
- <state relative-caret-position="294">
|
|
|
79
|
- <caret line="22" column="33" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
|
78
|
+ <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" />
|
80
|
</state>
|
80
|
</state>
|
81
|
</provider>
|
81
|
</provider>
|
82
|
</entry>
|
82
|
</entry>
|
|
@@ -270,7 +270,7 @@ |
|
@@ -270,7 +270,7 @@ |
270
|
<workItem from="1535514127808" duration="727000" />
|
270
|
<workItem from="1535514127808" duration="727000" />
|
271
|
<workItem from="1535532970259" duration="2527000" />
|
271
|
<workItem from="1535532970259" duration="2527000" />
|
272
|
<workItem from="1535546044129" duration="20814000" />
|
272
|
<workItem from="1535546044129" duration="20814000" />
|
273
|
- <workItem from="1535633001243" duration="3953000" />
|
273
|
+ <workItem from="1535633001243" duration="4322000" />
|
274
|
</task>
|
274
|
</task>
|
275
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
275
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
276
|
<created>1535458170068</created>
|
276
|
<created>1535458170068</created>
|
|
@@ -552,11 +552,25 @@ |
|
@@ -552,11 +552,25 @@ |
552
|
<option name="project" value="LOCAL" />
|
552
|
<option name="project" value="LOCAL" />
|
553
|
<updated>1535637256089</updated>
|
553
|
<updated>1535637256089</updated>
|
554
|
</task>
|
554
|
</task>
|
555
|
- <option name="localTasksCounter" value="41" />
|
555
|
+ <task id="LOCAL-00041" summary="登录处理">
|
|
|
556
|
+ <created>1535637470734</created>
|
|
|
557
|
+ <option name="number" value="00041" />
|
|
|
558
|
+ <option name="presentableId" value="LOCAL-00041" />
|
|
|
559
|
+ <option name="project" value="LOCAL" />
|
|
|
560
|
+ <updated>1535637470734</updated>
|
|
|
561
|
+ </task>
|
|
|
562
|
+ <task id="LOCAL-00042" summary="登录处理">
|
|
|
563
|
+ <created>1535637704890</created>
|
|
|
564
|
+ <option name="number" value="00042" />
|
|
|
565
|
+ <option name="presentableId" value="LOCAL-00042" />
|
|
|
566
|
+ <option name="project" value="LOCAL" />
|
|
|
567
|
+ <updated>1535637704890</updated>
|
|
|
568
|
+ </task>
|
|
|
569
|
+ <option name="localTasksCounter" value="43" />
|
556
|
<servers />
|
570
|
<servers />
|
557
|
</component>
|
571
|
</component>
|
558
|
<component name="TimeTrackingManager">
|
572
|
<component name="TimeTrackingManager">
|
559
|
- <option name="totallyTimeSpent" value="58405000" />
|
573
|
+ <option name="totallyTimeSpent" value="58774000" />
|
560
|
</component>
|
574
|
</component>
|
561
|
<component name="ToolWindowManager">
|
575
|
<component name="ToolWindowManager">
|
562
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
576
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -891,8 +905,8 @@ |
|
@@ -891,8 +905,8 @@ |
891
|
</entry>
|
905
|
</entry>
|
892
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
906
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
893
|
<provider selected="true" editor-type-id="text-editor">
|
907
|
<provider selected="true" editor-type-id="text-editor">
|
894
|
- <state relative-caret-position="294">
|
|
|
895
|
- <caret line="22" column="33" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
|
908
|
+ <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" />
|
896
|
</state>
|
910
|
</state>
|
897
|
</provider>
|
911
|
</provider>
|
898
|
</entry>
|
912
|
</entry>
|