|
|
@@ -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/Supplier.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Supplier.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/api/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Activity.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -225,7 +225,7 @@
|
|
|
<workItem from="1665448772446" duration="594000" />
|
|
|
<workItem from="1665451038308" duration="20434000" />
|
|
|
<workItem from="1665535775245" duration="5105000" />
|
|
|
- <workItem from="1665543789478" duration="8611000" />
|
|
|
+ <workItem from="1665543789478" duration="9719000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
@@ -299,9 +299,9 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="1058" y="441" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1663725356068" />
|
|
|
- <state x="1237" y="367" width="672" height="678" key="search.everywhere.popup" timestamp="1664519151846">
|
|
|
+ <state x="1237" y="367" width="672" height="678" key="search.everywhere.popup" timestamp="1665558749813">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="1237" y="367" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1664519151846" />
|
|
|
+ <state x="1237" y="367" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1665558749813" />
|
|
|
</component>
|
|
|
</project>
|
