正在显示
2 个修改的文件
包含
23 行增加
和
26 行删除
@@ -4,10 +4,7 @@ | @@ -4,10 +4,7 @@ | ||
4 | <bookmark url="file://$PROJECT_DIR$/application/home/view/member/my_information.html" line="118" mnemonic="4" /> | 4 | <bookmark url="file://$PROJECT_DIR$/application/home/view/member/my_information.html" line="118" mnemonic="4" /> |
5 | </component> | 5 | </component> |
6 | <component name="ChangeListManager"> | 6 | <component name="ChangeListManager"> |
7 | - <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> | ||
8 | - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | ||
9 | - <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" /> | ||
10 | - </list> | 7 | + <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="" /> |
11 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
12 | <option name="TRACKING_ENABLED" value="true" /> | 9 | <option name="TRACKING_ENABLED" value="true" /> |
13 | <option name="SHOW_DIALOG" value="false" /> | 10 | <option name="SHOW_DIALOG" value="false" /> |
@@ -82,8 +79,8 @@ | @@ -82,8 +79,8 @@ | ||
82 | <file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true"> | 79 | <file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true"> |
83 | <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html"> | 80 | <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html"> |
84 | <provider selected="true" editor-type-id="text-editor"> | 81 | <provider selected="true" editor-type-id="text-editor"> |
85 | - <state relative-caret-position="595"> | ||
86 | - <caret line="50" column="16" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="16" /> | 82 | + <state relative-caret-position="272"> |
83 | + <caret line="16" column="30" lean-forward="true" selection-start-line="16" selection-start-column="30" selection-end-line="16" selection-end-column="30" /> | ||
87 | </state> | 84 | </state> |
88 | </provider> | 85 | </provider> |
89 | </entry> | 86 | </entry> |
@@ -437,21 +434,7 @@ | @@ -437,21 +434,7 @@ | ||
437 | <workItem from="1573000530976" duration="6061000" /> | 434 | <workItem from="1573000530976" duration="6061000" /> |
438 | <workItem from="1573087576825" duration="5555000" /> | 435 | <workItem from="1573087576825" duration="5555000" /> |
439 | <workItem from="1573174620844" duration="32581000" /> | 436 | <workItem from="1573174620844" duration="32581000" /> |
440 | - <workItem from="1573259331081" duration="18087000" /> | ||
441 | - </task> | ||
442 | - <task id="LOCAL-00437" summary="商户申请"> | ||
443 | - <created>1573265098591</created> | ||
444 | - <option name="number" value="00437" /> | ||
445 | - <option name="presentableId" value="LOCAL-00437" /> | ||
446 | - <option name="project" value="LOCAL" /> | ||
447 | - <updated>1573265098591</updated> | ||
448 | - </task> | ||
449 | - <task id="LOCAL-00438" summary="商户申请"> | ||
450 | - <created>1573265155637</created> | ||
451 | - <option name="number" value="00438" /> | ||
452 | - <option name="presentableId" value="LOCAL-00438" /> | ||
453 | - <option name="project" value="LOCAL" /> | ||
454 | - <updated>1573265155637</updated> | 437 | + <workItem from="1573259331081" duration="18202000" /> |
455 | </task> | 438 | </task> |
456 | <task id="LOCAL-00439" summary="商户申请"> | 439 | <task id="LOCAL-00439" summary="商户申请"> |
457 | <created>1573265187852</created> | 440 | <created>1573265187852</created> |
@@ -782,11 +765,25 @@ | @@ -782,11 +765,25 @@ | ||
782 | <option name="project" value="LOCAL" /> | 765 | <option name="project" value="LOCAL" /> |
783 | <updated>1573280962475</updated> | 766 | <updated>1573280962475</updated> |
784 | </task> | 767 | </task> |
785 | - <option name="localTasksCounter" value="486" /> | 768 | + <task id="LOCAL-00486" summary="商户申请"> |
769 | + <created>1573281110799</created> | ||
770 | + <option name="number" value="00486" /> | ||
771 | + <option name="presentableId" value="LOCAL-00486" /> | ||
772 | + <option name="project" value="LOCAL" /> | ||
773 | + <updated>1573281110799</updated> | ||
774 | + </task> | ||
775 | + <task id="LOCAL-00487" summary="商户申请"> | ||
776 | + <created>1573281203802</created> | ||
777 | + <option name="number" value="00487" /> | ||
778 | + <option name="presentableId" value="LOCAL-00487" /> | ||
779 | + <option name="project" value="LOCAL" /> | ||
780 | + <updated>1573281203802</updated> | ||
781 | + </task> | ||
782 | + <option name="localTasksCounter" value="488" /> | ||
786 | <servers /> | 783 | <servers /> |
787 | </component> | 784 | </component> |
788 | <component name="TimeTrackingManager"> | 785 | <component name="TimeTrackingManager"> |
789 | - <option name="totallyTimeSpent" value="391760000" /> | 786 | + <option name="totallyTimeSpent" value="391875000" /> |
790 | </component> | 787 | </component> |
791 | <component name="ToolWindowManager"> | 788 | <component name="ToolWindowManager"> |
792 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> | 789 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
@@ -1199,8 +1196,8 @@ | @@ -1199,8 +1196,8 @@ | ||
1199 | </entry> | 1196 | </entry> |
1200 | <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html"> | 1197 | <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html"> |
1201 | <provider selected="true" editor-type-id="text-editor"> | 1198 | <provider selected="true" editor-type-id="text-editor"> |
1202 | - <state relative-caret-position="595"> | ||
1203 | - <caret line="50" column="16" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="16" /> | 1199 | + <state relative-caret-position="272"> |
1200 | + <caret line="16" column="30" lean-forward="true" selection-start-line="16" selection-start-column="30" selection-end-line="16" selection-end-column="30" /> | ||
1204 | </state> | 1201 | </state> |
1205 | </provider> | 1202 | </provider> |
1206 | </entry> | 1203 | </entry> |
-
请 注册 或 登录 后发表评论