...
|
...
|
@@ -4,7 +4,7 @@ |
|
|
<bookmark url="file://$PROJECT_DIR$/application/home/view/member/my_information.html" line="118" mnemonic="4" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=" 商户申请">
|
|
|
<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>
|
...
|
...
|
@@ -37,8 +37,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="272">
|
|
|
<caret line="192" column="58" selection-start-line="192" selection-start-column="58" selection-end-line="192" selection-end-column="58" />
|
|
|
<state relative-caret-position="340">
|
|
|
<caret line="160" column="45" selection-start-line="160" selection-start-column="45" selection-end-line="160" selection-end-column="45" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -363,14 +363,7 @@ |
|
|
<workItem from="1573174620844" duration="32581000" />
|
|
|
<workItem from="1573259331081" duration="30435000" />
|
|
|
<workItem from="1573432217070" duration="2199000" />
|
|
|
<workItem from="1573519427130" duration="12025000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00535" summary=" 商户申请">
|
|
|
<created>1573292751851</created>
|
|
|
<option name="number" value="00535" />
|
|
|
<option name="presentableId" value="LOCAL-00535" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573292751851</updated>
|
|
|
<workItem from="1573519427130" duration="12088000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00536" summary=" 商户申请">
|
|
|
<created>1573292769617</created>
|
...
|
...
|
@@ -708,11 +701,18 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573543214598</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="584" />
|
|
|
<task id="LOCAL-00584" summary=" 商户申请">
|
|
|
<created>1573543410564</created>
|
|
|
<option name="number" value="00584" />
|
|
|
<option name="presentableId" value="LOCAL-00584" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573543410564</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="585" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="418332000" />
|
|
|
<option name="totallyTimeSpent" value="418395000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -1103,8 +1103,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="272">
|
|
|
<caret line="192" column="58" selection-start-line="192" selection-start-column="58" selection-end-line="192" selection-end-column="58" />
|
|
|
<state relative-caret-position="340">
|
|
|
<caret line="160" column="45" selection-start-line="160" selection-start-column="45" selection-end-line="160" selection-end-column="45" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|