|
@@ -3,7 +3,9 @@
|
|
|
<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$/public/dist/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/dist/index.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/mall/view/express_company/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/view/express_company/index.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/mall/view/freight_template/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/view/freight_template/index.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/mall/view/store_goods/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/view/store_goods/index.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -378,7 +380,7 @@
|
|
|
<workItem from="1689813742376" duration="13449000" />
|
|
|
<workItem from="1689900489647" duration="18483000" />
|
|
|
<workItem from="1690159826319" duration="22343000" />
|
|
|
- <workItem from="1690246325106" duration="9100000" />
|
|
|
+ <workItem from="1690246325106" duration="9562000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -544,10 +546,10 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="1291" y="317" key="run.anything.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1686300134364" />
|
|
|
- <state x="1581" y="565" width="672" height="678" key="search.everywhere.popup" timestamp="1689934349617">
|
|
|
+ <state x="1581" y="565" width="672" height="678" key="search.everywhere.popup" timestamp="1690263804726">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="1581" y="565" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1689934349617" />
|
|
|
+ <state x="1581" y="565" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1690263804726" />
|
|
|
<state x="1115" y="647" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1683770722863">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|