|
|
@@ -1,10 +1,7 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/template_info.html" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/template_info.html" afterDir="false" />
|
|
|
- </list>
|
|
|
+ <list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
|
@@ -206,7 +203,7 @@
|
|
|
<workItem from="1585628259581" duration="1403000" />
|
|
|
<workItem from="1585706005737" duration="789000" />
|
|
|
<workItem from="1585792990603" duration="197000" />
|
|
|
- <workItem from="1585812151059" duration="2300000" />
|
|
|
+ <workItem from="1585812151059" duration="3766000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
@@ -218,11 +215,11 @@
|
|
|
<screen x="0" y="23" width="1440" height="822" />
|
|
|
</state>
|
|
|
<state x="184" y="96" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.1440.822@0.23.1440.822" timestamp="1584449391479" />
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.0.bottom" timestamp="1585819809488">
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.bottom" timestamp="1585820461717">
|
|
|
<screen x="0" y="23" width="1440" height="823" />
|
|
|
</state>
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793191751" />
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809488" />
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461717" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136936" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764830" />
|
|
|
<state width="1398" height="232" key="GridCell.Tab.0.bottom/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
|
|
|
@@ -231,11 +228,11 @@
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287029" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585565681676" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560326117" />
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.0.center" timestamp="1585819809487">
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.center" timestamp="1585820461715">
|
|
|
<screen x="0" y="23" width="1440" height="823" />
|
|
|
</state>
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793191750" />
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809487" />
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461715" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136935" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764829" />
|
|
|
<state width="1398" height="232" key="GridCell.Tab.0.center/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
|
|
|
@@ -244,11 +241,11 @@
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287028" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.828@0.23.1440.828" timestamp="1585565681675" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.829@0.23.1440.829" timestamp="1585560326115" />
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.0.left" timestamp="1585819809485">
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.left" timestamp="1585820461714">
|
|
|
<screen x="0" y="23" width="1440" height="823" />
|
|
|
</state>
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793191749" />
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809485" />
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461714" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136935" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764829" />
|
|
|
<state width="1398" height="232" key="GridCell.Tab.0.left/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
|
|
|
@@ -257,11 +254,11 @@
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287027" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.828@0.23.1440.828" timestamp="1585565681675" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.829@0.23.1440.829" timestamp="1585560326115" />
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.0.right" timestamp="1585819809487">
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.right" timestamp="1585820461716">
|
|
|
<screen x="0" y="23" width="1440" height="823" />
|
|
|
</state>
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793191750" />
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809487" />
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461716" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136936" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764830" />
|
|
|
<state width="1398" height="232" key="GridCell.Tab.0.right/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
|
|
|
@@ -270,40 +267,40 @@
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287028" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.828@0.23.1440.828" timestamp="1585565681676" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.829@0.23.1440.829" timestamp="1585560326116" />
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.1.bottom" timestamp="1585819809491">
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.1.bottom" timestamp="1585820461718">
|
|
|
<screen x="0" y="23" width="1440" height="823" />
|
|
|
</state>
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809491" />
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461718" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764831" />
|
|
|
<state width="1398" height="232" key="GridCell.Tab.1.bottom/0.23.1440.826@0.23.1440.826" timestamp="1585555485991" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421910" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585568481549" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585565681678" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560326118" />
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.1.center" timestamp="1585819809489">
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.1.center" timestamp="1585820461718">
|
|
|
<screen x="0" y="23" width="1440" height="823" />
|
|
|
</state>
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809489" />
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461718" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764831" />
|
|
|
<state width="1398" height="232" key="GridCell.Tab.1.center/0.23.1440.826@0.23.1440.826" timestamp="1585555485990" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.827@0.23.1440.827" timestamp="1585568481548" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.828@0.23.1440.828" timestamp="1585565681677" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.829@0.23.1440.829" timestamp="1585560326118" />
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.1.left" timestamp="1585819809489">
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.1.left" timestamp="1585820461717">
|
|
|
<screen x="0" y="23" width="1440" height="823" />
|
|
|
</state>
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809489" />
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461717" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764831" />
|
|
|
<state width="1398" height="232" key="GridCell.Tab.1.left/0.23.1440.826@0.23.1440.826" timestamp="1585555485990" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.827@0.23.1440.827" timestamp="1585568481548" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.828@0.23.1440.828" timestamp="1585565681677" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.829@0.23.1440.829" timestamp="1585560326117" />
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.1.right" timestamp="1585819809490">
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.1.right" timestamp="1585820461718">
|
|
|
<screen x="0" y="23" width="1440" height="823" />
|
|
|
</state>
|
|
|
- <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809490" />
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461718" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764831" />
|
|
|
<state width="1398" height="232" key="GridCell.Tab.1.right/0.23.1440.826@0.23.1440.826" timestamp="1585555485991" />
|
|
|
<state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
|
|
|
@@ -319,10 +316,11 @@
|
|
|
<state x="794" y="313" key="com.intellij.ide.util.TipDialog/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706024772" />
|
|
|
<state x="794" y="314" key="com.intellij.ide.util.TipDialog/0.23.1440.829@0.23.1440.829" timestamp="1585363207913" />
|
|
|
<state x="794" y="314" key="com.intellij.ide.util.TipDialog/0.23.1440.830@0.23.1440.830" timestamp="1585360101388" />
|
|
|
- <state x="520" y="85" width="837" height="550" key="find.popup" timestamp="1585793066665">
|
|
|
- <screen x="0" y="23" width="1440" height="822" />
|
|
|
+ <state x="520" y="85" width="837" height="551" key="find.popup" timestamp="1585820456455">
|
|
|
+ <screen x="0" y="23" width="1440" height="823" />
|
|
|
</state>
|
|
|
<state x="520" y="85" width="837" height="550" key="find.popup/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793066665" />
|
|
|
+ <state x="520" y="85" width="837" height="551" key="find.popup/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820456455" />
|
|
|
<state x="520" y="85" width="837" height="550" key="find.popup/0.23.1440.827@0.23.1440.827" timestamp="1585561388202" />
|
|
|
<state x="520" y="85" width="837" height="551" key="find.popup/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706205429" />
|
|
|
<state x="603" y="159" width="837" height="550" key="find.popup/0.23.1440.830@0.23.1440.830" timestamp="1585360905858" />
|
fuyu