...
|
...
|
@@ -5,7 +5,6 @@ |
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
...
|
...
|
@@ -58,8 +57,8 @@ |
|
|
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="629">
|
|
|
<caret line="37" column="28" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="28" />
|
|
|
<state relative-caret-position="612">
|
|
|
<caret line="36" column="15" selection-start-line="36" selection-start-column="15" selection-end-line="36" selection-end-column="15" />
|
|
|
<folding>
|
|
|
<element signature="e#2807#3332#0" />
|
|
|
<element signature="e#4045#4570#0" />
|
...
|
...
|
@@ -463,14 +462,7 @@ |
|
|
<workItem from="1573000530976" duration="6061000" />
|
|
|
<workItem from="1573087576825" duration="5555000" />
|
|
|
<workItem from="1573174620844" duration="32581000" />
|
|
|
<workItem from="1573259331081" duration="17062000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00429" summary="我的分享">
|
|
|
<created>1573214175320</created>
|
|
|
<option name="number" value="00429" />
|
|
|
<option name="presentableId" value="LOCAL-00429" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573214175320</updated>
|
|
|
<workItem from="1573259331081" duration="17114000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00430" summary="我的分享">
|
|
|
<created>1573262474593</created>
|
...
|
...
|
@@ -808,11 +800,18 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573279589367</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="478" />
|
|
|
<task id="LOCAL-00478" summary="商户申请">
|
|
|
<created>1573280078075</created>
|
|
|
<option name="number" value="00478" />
|
|
|
<option name="presentableId" value="LOCAL-00478" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573280078075</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="479" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="390735000" />
|
|
|
<option name="totallyTimeSpent" value="390787000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -1225,8 +1224,8 @@ |
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="629">
|
|
|
<caret line="37" column="28" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="28" />
|
|
|
<state relative-caret-position="612">
|
|
|
<caret line="36" column="15" selection-start-line="36" selection-start-column="15" selection-end-line="36" selection-end-column="15" />
|
|
|
<folding>
|
|
|
<element signature="e#2807#3332#0" />
|
|
|
<element signature="e#4045#4570#0" />
|
...
|
...
|
|