|
@@ -4,7 +4,6 @@
|
|
|
<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/operate/controller/SupplierGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/vendor/zoujingli/think-library/src/Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/zoujingli/think-library/src/Controller.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -169,7 +168,7 @@
|
|
|
<workItem from="1661520525074" duration="602000" />
|
|
|
<workItem from="1666574984353" duration="7852000" />
|
|
|
<workItem from="1666659002848" duration="14268000" />
|
|
|
- <workItem from="1666746114555" duration="8574000" />
|
|
|
+ <workItem from="1666746114555" duration="9115000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -239,9 +238,10 @@
|
|
|
<screen x="0" y="0" width="1920" height="1040" />
|
|
|
</state>
|
|
|
<state x="741" y="254" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1666749191018" />
|
|
|
- <state x="1237" y="368" width="672" height="678" key="search.everywhere.popup" timestamp="1658834953550">
|
|
|
- <screen x="0" y="0" width="2560" height="1400" />
|
|
|
+ <state x="928" y="273" width="672" height="504" key="search.everywhere.popup" timestamp="1666764180775">
|
|
|
+ <screen x="0" y="0" width="1920" height="1040" />
|
|
|
</state>
|
|
|
+ <state x="928" y="273" width="672" height="504" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1666764180775" />
|
|
|
<state x="1237" y="368" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1658834953550" />
|
|
|
</component>
|
|
|
</project>
|