|
@@ -2,11 +2,11 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/application/operate/controller/ActivityQrcode.php" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/operate/view/activity_qrcode/form.html" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/operate/view/activity_qrcode/index.html" 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/view/activity/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/activity/index.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/common.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/controller/ActivityQrcode.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/ActivityQrcode.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/view/activity_qrcode/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/activity_qrcode/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/operate/view/activity_qrcode/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/activity_qrcode/index.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -378,7 +378,7 @@
|
|
|
<workItem from="1689581505379" duration="6890000" />
|
|
|
<workItem from="1689641487273" duration="19876000" />
|
|
|
<workItem from="1689728218007" duration="5405000" />
|
|
|
- <workItem from="1689813742376" duration="8002000" />
|
|
|
+ <workItem from="1689813742376" duration="8548000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -508,10 +508,10 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="1410" y="539" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1684374232836" />
|
|
|
- <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1689674310618">
|
|
|
+ <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1689823539046">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1689674310618" />
|
|
|
+ <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1689823539046" />
|
|
|
<state x="420" y="147" width="1942" height="1088" key="DiffContextDialog" timestamp="1689585156769">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
@@ -532,10 +532,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="1687246001889" />
|
|
|
- <state x="830" y="186" width="1407" height="1056" key="find.popup" timestamp="1689735326812">
|
|
|
+ <state x="830" y="186" width="1407" height="1056" key="find.popup" timestamp="1689823640182">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="830" y="186" width="1407" height="1056" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1689735326812" />
|
|
|
+ <state x="830" y="186" width="1407" height="1056" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1689823640182" />
|
|
|
<state x="1282" y="549" key="ftp.server.browser" timestamp="1684465678841">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|