|
@@ -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/Expedite.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Expedite.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/mall/view/store_goods/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/view/store_goods/form.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -121,7 +121,7 @@
|
|
|
<component name="PropertiesComponent">
|
|
|
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../dingding" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../firstsy" />
|
|
|
<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" />
|
|
@@ -208,7 +208,8 @@
|
|
|
<workItem from="1672014482595" duration="6611000" />
|
|
|
<workItem from="1672102740019" duration="3380000" />
|
|
|
<workItem from="1672186838373" duration="4384000" />
|
|
|
- <workItem from="1672274308370" duration="1499000" />
|
|
|
+ <workItem from="1672274308370" duration="2131000" />
|
|
|
+ <workItem from="1672360556201" duration="3495000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -288,10 +289,10 @@
|
|
|
</state>
|
|
|
<state x="212" y="108" width="1457" height="809" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1671196737449" />
|
|
|
<state x="283" y="145" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1670291222413" />
|
|
|
- <state x="1064" y="382" key="FileChooserDialogImpl" timestamp="1672280084085">
|
|
|
+ <state x="1064" y="382" key="FileChooserDialogImpl" timestamp="1672380969344">
|
|
|
<screen x="0" y="0" width="1920" height="1040" />
|
|
|
</state>
|
|
|
- <state x="1064" y="382" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1672280084085" />
|
|
|
+ <state x="1064" y="382" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1672380969344" />
|
|
|
<state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1670578042981" />
|
|
|
<state x="981" y="616" key="VCS.ChangelistChooser" timestamp="1667975342482">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
@@ -301,10 +302,10 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="793" y="524" key="VcsDiffUtil.ChangesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1667975468009" />
|
|
|
- <state x="400" y="215" key="com.intellij.ide.util.TipDialog" timestamp="1672279950078">
|
|
|
+ <state x="400" y="215" key="com.intellij.ide.util.TipDialog" timestamp="1672361926045">
|
|
|
<screen x="0" y="0" width="1920" height="1040" />
|
|
|
</state>
|
|
|
- <state x="400" y="215" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1672279950078" />
|
|
|
+ <state x="400" y="215" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1672361926045" />
|
|
|
<state x="533" y="290" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1670547524889" />
|
|
|
<state x="875" y="449" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1671670365243">
|
|
|
<screen x="0" y="0" width="1920" height="1040" />
|