|
@@ -20,8 +20,8 @@ |
|
@@ -20,8 +20,8 @@ |
20
|
<file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true">
|
20
|
<file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true">
|
21
|
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
|
21
|
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
|
22
|
<provider selected="true" editor-type-id="text-editor">
|
22
|
<provider selected="true" editor-type-id="text-editor">
|
23
|
- <state relative-caret-position="672">
|
|
|
24
|
- <caret line="75" column="48" lean-forward="true" selection-start-line="75" selection-start-column="48" selection-end-line="75" selection-end-column="48" />
|
23
|
+ <state relative-caret-position="147">
|
|
|
24
|
+ <caret line="48" column="21" selection-start-line="48" selection-start-column="21" selection-end-line="48" selection-end-column="21" />
|
25
|
<folding>
|
25
|
<folding>
|
26
|
<element signature="e#636#668#0#PHP" expanded="true" />
|
26
|
<element signature="e#636#668#0#PHP" expanded="true" />
|
27
|
<element signature="e#911#990#0#PHP" />
|
27
|
<element signature="e#911#990#0#PHP" />
|
|
@@ -163,8 +163,8 @@ |
|
@@ -163,8 +163,8 @@ |
163
|
<file leaf-file-name="ToolController.php" pinned="false" current-in-tab="false">
|
163
|
<file leaf-file-name="ToolController.php" pinned="false" current-in-tab="false">
|
164
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
|
164
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
|
165
|
<provider selected="true" editor-type-id="text-editor">
|
165
|
<provider selected="true" editor-type-id="text-editor">
|
166
|
- <state relative-caret-position="189">
|
|
|
167
|
- <caret line="20" column="63" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="63" />
|
166
|
+ <state relative-caret-position="462">
|
|
|
167
|
+ <caret line="33" column="3" lean-forward="true" selection-start-line="33" selection-start-column="3" selection-end-line="33" selection-end-column="3" />
|
168
|
</state>
|
168
|
</state>
|
169
|
</provider>
|
169
|
</provider>
|
170
|
</entry>
|
170
|
</entry>
|
|
@@ -253,9 +253,9 @@ |
|
@@ -253,9 +253,9 @@ |
253
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
|
253
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
|
254
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" />
|
254
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" />
|
255
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm" />
|
255
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm" />
|
256
|
- <option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
|
|
|
257
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php" />
|
256
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php" />
|
258
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />
|
257
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />
|
|
|
258
|
+ <option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
|
259
|
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
|
259
|
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
|
260
|
</list>
|
260
|
</list>
|
261
|
</option>
|
261
|
</option>
|
|
@@ -378,7 +378,7 @@ |
|
@@ -378,7 +378,7 @@ |
378
|
<workItem from="1535458114609" duration="13848000" />
|
378
|
<workItem from="1535458114609" duration="13848000" />
|
379
|
<workItem from="1535514127808" duration="727000" />
|
379
|
<workItem from="1535514127808" duration="727000" />
|
380
|
<workItem from="1535532970259" duration="2527000" />
|
380
|
<workItem from="1535532970259" duration="2527000" />
|
381
|
- <workItem from="1535546044129" duration="9763000" />
|
381
|
+ <workItem from="1535546044129" duration="10189000" />
|
382
|
</task>
|
382
|
</task>
|
383
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
383
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
384
|
<created>1535458170068</created>
|
384
|
<created>1535458170068</created>
|
|
@@ -506,11 +506,25 @@ |
|
@@ -506,11 +506,25 @@ |
506
|
<option name="project" value="LOCAL" />
|
506
|
<option name="project" value="LOCAL" />
|
507
|
<updated>1535548842017</updated>
|
507
|
<updated>1535548842017</updated>
|
508
|
</task>
|
508
|
</task>
|
509
|
- <option name="localTasksCounter" value="19" />
|
509
|
+ <task id="LOCAL-00019" summary="测试获取当前时段的老师">
|
|
|
510
|
+ <created>1535559377550</created>
|
|
|
511
|
+ <option name="number" value="00019" />
|
|
|
512
|
+ <option name="presentableId" value="LOCAL-00019" />
|
|
|
513
|
+ <option name="project" value="LOCAL" />
|
|
|
514
|
+ <updated>1535559377550</updated>
|
|
|
515
|
+ </task>
|
|
|
516
|
+ <task id="LOCAL-00020" summary="测试获取当前时段的老师">
|
|
|
517
|
+ <created>1535559508443</created>
|
|
|
518
|
+ <option name="number" value="00020" />
|
|
|
519
|
+ <option name="presentableId" value="LOCAL-00020" />
|
|
|
520
|
+ <option name="project" value="LOCAL" />
|
|
|
521
|
+ <updated>1535559508443</updated>
|
|
|
522
|
+ </task>
|
|
|
523
|
+ <option name="localTasksCounter" value="21" />
|
510
|
<servers />
|
524
|
<servers />
|
511
|
</component>
|
525
|
</component>
|
512
|
<component name="TimeTrackingManager">
|
526
|
<component name="TimeTrackingManager">
|
513
|
- <option name="totallyTimeSpent" value="43401000" />
|
527
|
+ <option name="totallyTimeSpent" value="43827000" />
|
514
|
</component>
|
528
|
</component>
|
515
|
<component name="ToolWindowManager">
|
529
|
<component name="ToolWindowManager">
|
516
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
530
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -551,7 +565,8 @@ |
|
@@ -551,7 +565,8 @@ |
551
|
<MESSAGE value="已评价无数据情况" />
|
565
|
<MESSAGE value="已评价无数据情况" />
|
552
|
<MESSAGE value="取消预约短信" />
|
566
|
<MESSAGE value="取消预约短信" />
|
553
|
<MESSAGE value="ceshi wode jiaolian" />
|
567
|
<MESSAGE value="ceshi wode jiaolian" />
|
554
|
- <option name="LAST_COMMIT_MESSAGE" value="ceshi wode jiaolian" />
|
568
|
+ <MESSAGE value="测试获取当前时段的老师" />
|
|
|
569
|
+ <option name="LAST_COMMIT_MESSAGE" value="测试获取当前时段的老师" />
|
555
|
</component>
|
570
|
</component>
|
556
|
<component name="editorHistoryManager">
|
571
|
<component name="editorHistoryManager">
|
557
|
<entry file="file://$PROJECT_DIR$/api/portal/controller/UserController.php">
|
572
|
<entry file="file://$PROJECT_DIR$/api/portal/controller/UserController.php">
|
|
@@ -877,24 +892,24 @@ |
|
@@ -877,24 +892,24 @@ |
877
|
</state>
|
892
|
</state>
|
878
|
</provider>
|
893
|
</provider>
|
879
|
</entry>
|
894
|
</entry>
|
880
|
- <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
|
895
|
+ <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
|
881
|
<provider selected="true" editor-type-id="text-editor">
|
896
|
<provider selected="true" editor-type-id="text-editor">
|
882
|
- <state relative-caret-position="189">
|
|
|
883
|
- <caret line="20" column="63" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="63" />
|
897
|
+ <state relative-caret-position="3507">
|
|
|
898
|
+ <caret line="175" column="36" lean-forward="true" selection-start-line="175" selection-start-column="36" selection-end-line="175" selection-end-column="36" />
|
884
|
</state>
|
899
|
</state>
|
885
|
</provider>
|
900
|
</provider>
|
886
|
</entry>
|
901
|
</entry>
|
887
|
- <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
|
902
|
+ <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
|
888
|
<provider selected="true" editor-type-id="text-editor">
|
903
|
<provider selected="true" editor-type-id="text-editor">
|
889
|
- <state relative-caret-position="3507">
|
|
|
890
|
- <caret line="175" column="36" lean-forward="true" selection-start-line="175" selection-start-column="36" selection-end-line="175" selection-end-column="36" />
|
904
|
+ <state relative-caret-position="462">
|
|
|
905
|
+ <caret line="33" column="3" lean-forward="true" selection-start-line="33" selection-start-column="3" selection-end-line="33" selection-end-column="3" />
|
891
|
</state>
|
906
|
</state>
|
892
|
</provider>
|
907
|
</provider>
|
893
|
</entry>
|
908
|
</entry>
|
894
|
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
|
909
|
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
|
895
|
<provider selected="true" editor-type-id="text-editor">
|
910
|
<provider selected="true" editor-type-id="text-editor">
|
896
|
- <state relative-caret-position="672">
|
|
|
897
|
- <caret line="75" column="48" lean-forward="true" selection-start-line="75" selection-start-column="48" selection-end-line="75" selection-end-column="48" />
|
911
|
+ <state relative-caret-position="147">
|
|
|
912
|
+ <caret line="48" column="21" selection-start-line="48" selection-start-column="21" selection-end-line="48" selection-end-column="21" />
|
898
|
<folding>
|
913
|
<folding>
|
899
|
<element signature="e#636#668#0#PHP" expanded="true" />
|
914
|
<element signature="e#636#668#0#PHP" expanded="true" />
|
900
|
<element signature="e#911#990#0#PHP" />
|
915
|
<element signature="e#911#990#0#PHP" />
|