|
...
|
...
|
@@ -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" />
|
|
...
|
...
|
@@ -37,8 +36,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="558">
|
|
|
|
<caret line="155" column="40" lean-forward="true" selection-start-line="155" selection-start-column="40" selection-end-line="155" selection-end-column="40" />
|
|
|
|
<state relative-caret-position="337">
|
|
|
|
<caret line="148" column="39" selection-start-line="148" selection-start-column="39" selection-end-line="148" selection-end-column="39" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
...
|
...
|
@@ -352,14 +351,7 @@ |
|
|
|
<workItem from="1573174620844" duration="32581000" />
|
|
|
|
<workItem from="1573259331081" duration="30435000" />
|
|
|
|
<workItem from="1573432217070" duration="2199000" />
|
|
|
|
<workItem from="1573519427130" duration="8068000" />
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00511" summary=" 商户申请">
|
|
|
|
<created>1573288157671</created>
|
|
|
|
<option name="number" value="00511" />
|
|
|
|
<option name="presentableId" value="LOCAL-00511" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573288157671</updated>
|
|
|
|
<workItem from="1573519427130" duration="8371000" />
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00512" summary=" 商户申请">
|
|
|
|
<created>1573288196317</created>
|
|
...
|
...
|
@@ -697,11 +689,18 @@ |
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573537094775</updated>
|
|
|
|
</task>
|
|
|
|
<option name="localTasksCounter" value="560" />
|
|
|
|
<task id="LOCAL-00560" summary=" 商户申请">
|
|
|
|
<created>1573539445903</created>
|
|
|
|
<option name="number" value="00560" />
|
|
|
|
<option name="presentableId" value="LOCAL-00560" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573539445903</updated>
|
|
|
|
</task>
|
|
|
|
<option name="localTasksCounter" value="561" />
|
|
|
|
<servers />
|
|
|
|
</component>
|
|
|
|
<component name="TimeTrackingManager">
|
|
|
|
<option name="totallyTimeSpent" value="414375000" />
|
|
|
|
<option name="totallyTimeSpent" value="414678000" />
|
|
|
|
</component>
|
|
|
|
<component name="ToolWindowManager">
|
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
...
|
...
|
@@ -1088,8 +1087,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="558">
|
|
|
|
<caret line="155" column="40" lean-forward="true" selection-start-line="155" selection-start-column="40" selection-end-line="155" selection-end-column="40" />
|
|
|
|
<state relative-caret-position="337">
|
|
|
|
<caret line="148" column="39" selection-start-line="148" selection-start-column="39" selection-end-line="148" selection-end-column="39" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
...
|
...
|
|
