|
@@ -1,7 +1,10 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="aa" />
|
|
|
+ <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="aa">
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/api/controller/Mall.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Mall.php" afterDir="false" />
|
|
|
+ </list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
@@ -178,7 +181,7 @@
|
|
|
<workItem from="1667263628412" duration="22693000" />
|
|
|
<workItem from="1667350901825" duration="20542000" />
|
|
|
<workItem from="1667437262057" duration="15186000" />
|
|
|
- <workItem from="1667522664245" duration="15577000" />
|
|
|
+ <workItem from="1667522664245" duration="16537000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|