|
@@ -3,8 +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/operate/controller/Demand.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/Demand.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/operate/controller/PlatformDemand.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/PlatformDemand.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/mall/controller/StoreGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/controller/StoreGoods.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -203,7 +202,7 @@
|
|
|
<workItem from="1670547445908" duration="12147000" />
|
|
|
<workItem from="1670633686675" duration="15717000" />
|
|
|
<workItem from="1670719843429" duration="8446000" />
|
|
|
- <workItem from="1670807412269" duration="6869000" />
|
|
|
+ <workItem from="1670807412269" duration="7048000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -302,10 +301,10 @@
|
|
|
</state>
|
|
|
<state x="875" y="449" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1665835639346" />
|
|
|
<state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1670665863869" />
|
|
|
- <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1670659294029">
|
|
|
+ <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1670816597032">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1670659294029" />
|
|
|
+ <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1670816597032" />
|
|
|
<state x="1291" y="317" key="run.anything.popup" timestamp="1668056889671">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|