|
@@ -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/nutrition/view/video_manage/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_manage/index.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" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -121,7 +121,7 @@
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/application/nutrition/view/video_comment" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../gaoyix_old" />
|
|
|
<property name="node.js.detected.package.eslint" value="true" />
|
|
|
<property name="node.js.detected.package.tslint" value="true" />
|
|
|
<property name="node.js.path.for.package.eslint" value="project" />
|
|
@@ -182,7 +182,7 @@
|
|
|
<workItem from="1660697982291" duration="9650000" />
|
|
|
<workItem from="1660730926670" duration="1018000" />
|
|
|
<workItem from="1660783282150" duration="17421000" />
|
|
|
- <workItem from="1660870368036" duration="7884000" />
|
|
|
+ <workItem from="1660870368036" duration="10668000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -206,10 +206,10 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="283" y="145" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1660792261626" />
|
|
|
- <state x="1281" y="514" key="FileChooserDialogImpl" timestamp="1660787301174">
|
|
|
+ <state x="1281" y="514" key="FileChooserDialogImpl" timestamp="1660888424112">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="1281" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1660787301174" />
|
|
|
+ <state x="1281" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1660888424112" />
|
|
|
<state x="1035" y="389" key="MultipleFileMergeDialog" timestamp="1659576166292">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|