|
|
@@ -2,10 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="a760c6e5-d38f-48d9-be27-0f7a4f48e29f" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/application/store/view/goods/add_first.html" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/store/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/controller/Goods.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/store/view/goods/import_first_list.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/goods/import_first_list.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -151,7 +148,7 @@
|
|
|
<workItem from="1661820079823" duration="2898000" />
|
|
|
<workItem from="1661907611720" duration="5931000" />
|
|
|
<workItem from="1661993135050" duration="4377000" />
|
|
|
- <workItem from="1662078426211" duration="1730000" />
|
|
|
+ <workItem from="1662078426211" duration="1790000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
