|
@@ -2,9 +2,6 @@ |
|
@@ -2,9 +2,6 @@ |
2
|
<project version="4">
|
2
|
<project version="4">
|
3
|
<component name="ChangeListManager">
|
3
|
<component name="ChangeListManager">
|
4
|
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
|
4
|
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
|
5
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" />
|
|
|
6
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/order/fapiao.html" afterPath="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
|
|
|
7
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
|
|
|
8
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
|
5
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
|
9
|
</list>
|
6
|
</list>
|
10
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
7
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -19,8 +16,8 @@ |
|
@@ -19,8 +16,8 @@ |
19
|
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
|
16
|
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
|
20
|
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
|
17
|
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
|
21
|
<provider selected="true" editor-type-id="text-editor">
|
18
|
<provider selected="true" editor-type-id="text-editor">
|
22
|
- <state relative-caret-position="-371">
|
|
|
23
|
- <caret line="1794" column="5" lean-forward="false" selection-start-line="1794" selection-start-column="5" selection-end-line="1794" selection-end-column="5" />
|
19
|
+ <state relative-caret-position="204">
|
|
|
20
|
+ <caret line="1811" column="31" lean-forward="true" selection-start-line="1811" selection-start-column="31" selection-end-line="1811" selection-end-column="31" />
|
24
|
<folding>
|
21
|
<folding>
|
25
|
<element signature="e#365#484#0#PHP" expanded="false" />
|
22
|
<element signature="e#365#484#0#PHP" expanded="false" />
|
26
|
<element signature="e#490#1228#0#PHP" expanded="false" />
|
23
|
<element signature="e#490#1228#0#PHP" expanded="false" />
|
|
@@ -201,9 +198,9 @@ |
|
@@ -201,9 +198,9 @@ |
201
|
<sorting>DEFINITION_ORDER</sorting>
|
198
|
<sorting>DEFINITION_ORDER</sorting>
|
202
|
</component>
|
199
|
</component>
|
203
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
200
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
204
|
- <component name="ProjectFrameBounds" extendedState="1">
|
|
|
205
|
- <option name="x" value="123" />
|
|
|
206
|
- <option name="y" value="82" />
|
201
|
+ <component name="ProjectFrameBounds">
|
|
|
202
|
+ <option name="x" value="313" />
|
|
|
203
|
+ <option name="y" value="89" />
|
207
|
<option name="width" value="1624" />
|
204
|
<option name="width" value="1624" />
|
208
|
<option name="height" value="916" />
|
205
|
<option name="height" value="916" />
|
209
|
</component>
|
206
|
</component>
|
|
@@ -402,7 +399,7 @@ |
|
@@ -402,7 +399,7 @@ |
402
|
<workItem from="1575773423431" duration="694000" />
|
399
|
<workItem from="1575773423431" duration="694000" />
|
403
|
<workItem from="1575776183372" duration="2267000" />
|
400
|
<workItem from="1575776183372" duration="2267000" />
|
404
|
<workItem from="1575790089275" duration="377000" />
|
401
|
<workItem from="1575790089275" duration="377000" />
|
405
|
- <workItem from="1575851041026" duration="10422000" />
|
402
|
+ <workItem from="1575851041026" duration="10769000" />
|
406
|
</task>
|
403
|
</task>
|
407
|
<task id="LOCAL-00001" summary="调试">
|
404
|
<task id="LOCAL-00001" summary="调试">
|
408
|
<created>1574145133364</created>
|
405
|
<created>1574145133364</created>
|
|
@@ -415,7 +412,7 @@ |
|
@@ -415,7 +412,7 @@ |
415
|
<servers />
|
412
|
<servers />
|
416
|
</component>
|
413
|
</component>
|
417
|
<component name="TimeTrackingManager">
|
414
|
<component name="TimeTrackingManager">
|
418
|
- <option name="totallyTimeSpent" value="350889000" />
|
415
|
+ <option name="totallyTimeSpent" value="351236000" />
|
419
|
</component>
|
416
|
</component>
|
420
|
<component name="TodoView">
|
417
|
<component name="TodoView">
|
421
|
<todo-panel id="selected-file">
|
418
|
<todo-panel id="selected-file">
|
|
@@ -427,7 +424,7 @@ |
|
@@ -427,7 +424,7 @@ |
427
|
</todo-panel>
|
424
|
</todo-panel>
|
428
|
</component>
|
425
|
</component>
|
429
|
<component name="ToolWindowManager">
|
426
|
<component name="ToolWindowManager">
|
430
|
- <frame x="123" y="82" width="1624" height="916" extended-state="1" />
|
427
|
+ <frame x="313" y="89" width="1624" height="916" extended-state="0" />
|
431
|
<editor active="true" />
|
428
|
<editor active="true" />
|
432
|
<layout>
|
429
|
<layout>
|
433
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15345268" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
|
430
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15345268" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
|
|
@@ -438,7 +435,7 @@ |
|
@@ -438,7 +435,7 @@ |
438
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
435
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
439
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
436
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
440
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
437
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
441
|
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.169448" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
438
|
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.169448" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
442
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
439
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
443
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
|
440
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
|
444
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
441
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
@@ -857,8 +854,8 @@ |
|
@@ -857,8 +854,8 @@ |
857
|
</entry>
|
854
|
</entry>
|
858
|
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
|
855
|
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
|
859
|
<provider selected="true" editor-type-id="text-editor">
|
856
|
<provider selected="true" editor-type-id="text-editor">
|
860
|
- <state relative-caret-position="-371">
|
|
|
861
|
- <caret line="1794" column="5" lean-forward="false" selection-start-line="1794" selection-start-column="5" selection-end-line="1794" selection-end-column="5" />
|
857
|
+ <state relative-caret-position="204">
|
|
|
858
|
+ <caret line="1811" column="31" lean-forward="true" selection-start-line="1811" selection-start-column="31" selection-end-line="1811" selection-end-column="31" />
|
862
|
<folding>
|
859
|
<folding>
|
863
|
<element signature="e#365#484#0#PHP" expanded="false" />
|
860
|
<element signature="e#365#484#0#PHP" expanded="false" />
|
864
|
<element signature="e#490#1228#0#PHP" expanded="false" />
|
861
|
<element signature="e#490#1228#0#PHP" expanded="false" />
|