...
|
...
|
@@ -2,8 +2,6 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
...
|
...
|
@@ -94,12 +92,12 @@ |
|
|
<element signature="e#64776#64913#1#PHP" expanded="false" />
|
|
|
<element signature="e#64943#65083#1#PHP" expanded="false" />
|
|
|
<element signature="e#65094#65185#0#PHP" expanded="false" />
|
|
|
<element signature="e#65601#65847#0#PHP" expanded="false" />
|
|
|
<element signature="e#66457#66625#0#PHP" expanded="false" />
|
|
|
<element signature="e#66703#67714#0#PHP" expanded="false" />
|
|
|
<element signature="e#67776#68155#0#PHP" expanded="false" />
|
|
|
<element signature="e#68574#69083#0#PHP" expanded="false" />
|
|
|
<element signature="e#69088#69760#0#PHP" expanded="false" />
|
|
|
<element signature="e#65611#65857#0#PHP" expanded="false" />
|
|
|
<element signature="e#66467#66635#0#PHP" expanded="false" />
|
|
|
<element signature="e#66713#67724#0#PHP" expanded="false" />
|
|
|
<element signature="e#67786#68165#0#PHP" expanded="false" />
|
|
|
<element signature="e#68584#69093#0#PHP" expanded="false" />
|
|
|
<element signature="e#69098#69770#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
@@ -434,8 +432,8 @@ |
|
|
</component>
|
|
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
|
|
<component name="ProjectFrameBounds">
|
|
|
<option name="x" value="420" />
|
|
|
<option name="y" value="57" />
|
|
|
<option name="x" value="383" />
|
|
|
<option name="y" value="50" />
|
|
|
<option name="width" value="1569" />
|
|
|
<option name="height" value="924" />
|
|
|
</component>
|
...
|
...
|
@@ -582,7 +580,7 @@ |
|
|
<workItem from="1576028218954" duration="680000" />
|
|
|
<workItem from="1576128183316" duration="7364000" />
|
|
|
<workItem from="1576135696788" duration="17540000" />
|
|
|
<workItem from="1576153922472" duration="3448000" />
|
|
|
<workItem from="1576153922472" duration="3621000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="调试">
|
|
|
<created>1574145133364</created>
|
...
|
...
|
@@ -609,7 +607,7 @@ |
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="418586000" />
|
|
|
<option name="totallyTimeSpent" value="418759000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
...
|
...
|
@@ -621,7 +619,7 @@ |
|
|
</todo-panel>
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="420" y="57" width="1569" height="924" extended-state="0" />
|
|
|
<frame x="383" y="50" width="1569" height="924" extended-state="0" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17958914" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
|
...
|
...
|
@@ -1519,12 +1517,12 @@ |
|
|
<element signature="e#64776#64913#1#PHP" expanded="false" />
|
|
|
<element signature="e#64943#65083#1#PHP" expanded="false" />
|
|
|
<element signature="e#65094#65185#0#PHP" expanded="false" />
|
|
|
<element signature="e#65601#65847#0#PHP" expanded="false" />
|
|
|
<element signature="e#66457#66625#0#PHP" expanded="false" />
|
|
|
<element signature="e#66703#67714#0#PHP" expanded="false" />
|
|
|
<element signature="e#67776#68155#0#PHP" expanded="false" />
|
|
|
<element signature="e#68574#69083#0#PHP" expanded="false" />
|
|
|
<element signature="e#69088#69760#0#PHP" expanded="false" />
|
|
|
<element signature="e#65611#65857#0#PHP" expanded="false" />
|
|
|
<element signature="e#66467#66635#0#PHP" expanded="false" />
|
|
|
<element signature="e#66713#67724#0#PHP" expanded="false" />
|
|
|
<element signature="e#67786#68165#0#PHP" expanded="false" />
|
|
|
<element signature="e#68584#69093#0#PHP" expanded="false" />
|
|
|
<element signature="e#69098#69770#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
|