|
|
@@ -3,8 +3,7 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="a760c6e5-d38f-48d9-be27-0f7a4f48e29f" 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/store/controller/CollectInfo.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/controller/CollectInfo.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/store/view/collect_info/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/collect_info/index_search.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/public/static/plugs/layui/layui.all.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/static/plugs/layui/layui.all.js" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -147,7 +146,8 @@
|
|
|
<workItem from="1661480993675" duration="3163000" />
|
|
|
<workItem from="1661561991957" duration="3680000" />
|
|
|
<workItem from="1661734371076" duration="15282000" />
|
|
|
- <workItem from="1661820079823" duration="1470000" />
|
|
|
+ <workItem from="1661820079823" duration="2898000" />
|
|
|
+ <workItem from="1661907611720" duration="158000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
@@ -171,10 +171,10 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="1171" y="588" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1661741217728" />
|
|
|
- <state x="1076" y="479" width="728" height="490" key="find.popup" timestamp="1661752615073">
|
|
|
+ <state x="1076" y="479" width="728" height="490" key="find.popup" timestamp="1661907630333">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="1076" y="479" width="728" height="490" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1661752615073" />
|
|
|
+ <state x="1076" y="479" width="728" height="490" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1661907630333" />
|
|
|
<state x="1164" y="436" width="672" height="678" key="search.everywhere.popup" timestamp="1661754698165">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
