|
@@ -2,12 +2,9 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/application/synth/controller/BillApply.php" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/form.html" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/index.html" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/index_search.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/synth/controller/BillHeader.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/controller/BillHeader.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/synth/controller/BillApply.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/controller/BillApply.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/synth/view/bill_apply/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/index.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -331,7 +328,7 @@
|
|
|
<workItem from="1684543423796" duration="10653000" />
|
|
|
<workItem from="1684716593546" duration="15730000" />
|
|
|
<workItem from="1684743465298" duration="6526000" />
|
|
|
- <workItem from="1684802887863" duration="1788000" />
|
|
|
+ <workItem from="1684802887863" duration="2167000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -461,10 +458,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="1684460479363">
|
|
|
+ <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1684804956286">
|
|
|
<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="1684460479363" />
|
|
|
+ <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1684804956286" />
|
|
|
<state x="420" y="147" width="1942" height="1088" key="DiffContextDialog" timestamp="1684740077011">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|