Skip to content

Q
qiaqia_qx
Commit 53971c2c authored by huangwenjie's avatar huangwenjie
Browse files
Options

Merge branch 'master' of http://gitlab2.dui88.com/haiyoucuv/qiaqia_qx

parents 40ef8869 66c9167a
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 15 deletions
.idea/workspace.xml
View file @ 53971c2c
......@@ -3,7 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="31be0130-d27d-4740-b668-956a8050e1bf" 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$/src/parts/UI/UILayer.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/UI/UILayer.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/WareHousePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/WareHousePanel.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -178,13 +178,8 @@
<workItem from="1593672225836" duration="14000" />
<workItem from="1593672335117" duration="1116000" />
<workItem from="1593761062744" duration="13000" />
</task>
<task id="LOCAL-00001" summary="1">
<created>1591003912929</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1591003912929</updated>
<workItem from="1594108793970" duration="42000" />
<workItem from="1594110577164" duration="203000" />
</task>
<task id="LOCAL-00002" summary="1">
<created>1591077711974</created>
......@@ -522,7 +517,14 @@
<option name="project" value="LOCAL" />
<updated>1592900414010</updated>
</task>
<option name="localTasksCounter" value="50" />
<task id="LOCAL-00050" summary="1111">
<created>1594108818525</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1594108818526</updated>
</task>
<option name="localTasksCounter" value="51" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -579,11 +581,11 @@
</state>
<state x="671" y="259" key="#com.intellij.ide.util.MemberChooser/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591344864454" />
<state x="764" y="293" key="#com.intellij.ide.util.MemberChooser/37.23.1883.1177@37.23.1883.1177" timestamp="1591929411133" />
<state x="524" y="120" key="CommitChangelistDialog2" timestamp="1592900413768">
<state x="524" y="120" key="CommitChangelistDialog2" timestamp="1594108818289">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="502" y="120" key="CommitChangelistDialog2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884607456" />
<state x="524" y="120" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1592900413768" />
<state x="524" y="120" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594108818289" />
<state x="525" y="120" key="CommitChangelistDialog2/32.23.1888.1177@32.23.1888.1177" timestamp="1592880318097" />
<state x="411" y="44" key="CommitChangelistDialog2/35.23.1405.877@35.23.1405.877" timestamp="1592293157840" />
<state x="466" y="108" key="CommitChangelistDialog2/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591003912498" />
......@@ -672,11 +674,11 @@
</state>
<state width="673" height="598" key="SwitcherDM/31.23.1889.1177@31.23.1889.1177" timestamp="1593568793331" />
<state width="500" height="445" key="SwitcherDM/35.23.1405.877@35.23.1405.877" timestamp="1592292721015" />
<state x="474" y="276" key="Vcs.Push.Dialog.v2" timestamp="1592900416655">
<state x="474" y="276" key="Vcs.Push.Dialog.v2" timestamp="1594108819669">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="491" y="313" key="Vcs.Push.Dialog.v2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884609437" />
<state x="474" y="276" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1592900416655" />
<state x="474" y="276" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1594108819669" />
<state x="514" y="313" key="Vcs.Push.Dialog.v2/32.23.1888.1177@32.23.1888.1177" timestamp="1592880319676" />
<state x="517" y="313" key="Vcs.Push.Dialog.v2/35.23.1885.1177@35.23.1885.1177" timestamp="1592373729832" />
<state x="518" y="313" key="Vcs.Push.Dialog.v2/36.23.1884.1177@36.23.1884.1177" timestamp="1591966205725" />
......@@ -704,12 +706,12 @@
<screen x="0" y="23" width="1920" height="1177" />
</state>
<state x="85" y="286" key="run.anything.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591883929114" />
<state x="589" y="283" width="905" height="778" key="search.everywhere.popup" timestamp="1593761065776">
<state x="589" y="283" width="905" height="778" key="search.everywhere.popup" timestamp="1594110580566">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="568" y="283" width="917" height="776" key="search.everywhere.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591884167098" />
<state x="518" y="250" width="791" height="679" key="search.everywhere.popup/31.23.1649.1027@31.23.1649.1027" timestamp="1592919255415" />
<state x="589" y="283" width="905" height="778" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1593761065776" />
<state x="589" y="283" width="905" height="778" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594110580566" />
<state x="2007" y="283" width="920" height="778" key="search.everywhere.popup/32.23.1408.877/1440.23.1920.1177@1440.23.1920.1177" timestamp="1592552467353" />
<state x="590" y="283" width="904" height="778" key="search.everywhere.popup/32.23.1888.1177@32.23.1888.1177" timestamp="1592891486677" />
<state x="450" y="217" width="674" height="580" key="search.everywhere.popup/35.23.1405.877@35.23.1405.877" timestamp="1592296171796" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment