|
@@ -2,11 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/application/common/model/ActivityTemplate.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/operate/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/Activity.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/operate/view/activity/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/activity/form.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/view/template_item/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/template_item/index.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -306,7 +302,7 @@
|
|
|
<workItem from="1682556776667" duration="259000" />
|
|
|
<workItem from="1682557049256" duration="2452000" />
|
|
|
<workItem from="1682560166739" duration="16718000" />
|
|
|
- <workItem from="1682643377193" duration="15600000" />
|
|
|
+ <workItem from="1682643377193" duration="15653000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|