|
@@ -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/UserCenter.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/UserCenter.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/controller/VideoManage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoManage.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -187,7 +187,8 @@
|
|
|
<workItem from="1668749820707" duration="5480000" />
|
|
|
<workItem from="1668757326903" duration="2455000" />
|
|
|
<workItem from="1668991533353" duration="2596000" />
|
|
|
- <workItem from="1669429338320" duration="142000" />
|
|
|
+ <workItem from="1669429338320" duration="861000" />
|
|
|
+ <workItem from="1669448616248" duration="440000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -282,11 +283,11 @@
|
|
|
</state>
|
|
|
<state x="797" y="383" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1661521474264" />
|
|
|
<state x="1063" y="515" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1668757616711" />
|
|
|
- <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1667974959772">
|
|
|
+ <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1669448707208">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="875" y="449" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1665835639346" />
|
|
|
- <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1667974959772" />
|
|
|
+ <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1669448707208" />
|
|
|
<state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1668763945859">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
@@ -295,9 +296,9 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="1291" y="317" key="run.anything.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1668056889671" />
|
|
|
- <state x="1237" y="368" width="672" height="678" key="search.everywhere.popup" timestamp="1666162507761">
|
|
|
+ <state x="1237" y="367" width="672" height="678" key="search.everywhere.popup" timestamp="1669438998762">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="1237" y="368" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1666162507761" />
|
|
|
+ <state x="1237" y="367" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1669438998762" />
|
|
|
</component>
|
|
|
</project>
|