|
@@ -3,7 +3,12 @@
|
|
|
<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/Upload.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Upload.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/view/article_item/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/article_item/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/view/datum_url/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/datum_url/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/view/one_article/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/one_article/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/view/one_datum/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/one_datum/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/view/video_manage/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_manage/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/view/video_url/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_url/form.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -270,7 +275,7 @@
|
|
|
<workItem from="1679532313623" duration="31448000" />
|
|
|
<workItem from="1679619041819" duration="29965000" />
|
|
|
<workItem from="1679706054685" duration="19035000" />
|
|
|
- <workItem from="1679878121007" duration="17441000" />
|
|
|
+ <workItem from="1679878121007" duration="17650000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -432,10 +437,10 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1676615702242" />
|
|
|
- <state x="1029" y="370" width="829" height="548" key="find.popup" timestamp="1679897284552">
|
|
|
+ <state x="1029" y="370" width="829" height="548" key="find.popup" timestamp="1679902685184">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="1029" y="370" width="829" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1679897284552" />
|
|
|
+ <state x="1029" y="370" width="829" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1679902685184" />
|
|
|
<state x="1291" y="317" key="run.anything.popup" timestamp="1679553349659">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|