|
|
@@ -3,7 +3,7 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/api/controller/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Order.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/mall/view/store_goods/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/view/store_goods/index.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -170,7 +170,7 @@
|
|
|
<workItem from="1666054299858" duration="23137000" />
|
|
|
<workItem from="1666140525910" duration="23609000" />
|
|
|
<workItem from="1666227349089" duration="7795000" />
|
|
|
- <workItem from="1666313182769" duration="7359000" />
|
|
|
+ <workItem from="1666313182769" duration="7835000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
