|
...
|
...
|
@@ -6,8 +6,6 @@ |
|
|
|
<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/admin/view/common/header.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/common/header.html" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/application/admin/view/common/menu.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/common/menu.html" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/application/admin/view/dashboard/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/dashboard/index.html" afterDir="false" />
|
|
|
|
</list>
|
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
...
|
...
|
@@ -40,13 +38,14 @@ |
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/view/dashboard/index.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="374">
|
|
|
|
<caret line="493" column="50" lean-forward="true" selection-start-line="493" selection-start-column="50" selection-end-line="493" selection-end-column="50" />
|
|
|
|
<caret line="493" column="91" selection-start-line="493" selection-start-column="91" selection-end-line="493" selection-end-column="91" />
|
|
|
|
<folding>
|
|
|
|
<element signature="e#3513#5412#0" />
|
|
|
|
<element signature="e#5423#10316#0" />
|
|
|
|
<element signature="e#10334#15406#0" />
|
|
|
|
<element signature="e#15431#17226#0" />
|
|
|
|
<element signature="e#17240#20059#0" />
|
|
|
|
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#!!top" expanded="true" />
|
|
|
|
</folding>
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
...
|
...
|
@@ -422,28 +421,7 @@ |
|
|
|
<workItem from="1573259331081" duration="30435000" />
|
|
|
|
<workItem from="1573432217070" duration="2199000" />
|
|
|
|
<workItem from="1573519427130" duration="17475000" />
|
|
|
|
<workItem from="1573605070739" duration="14629000" />
|
|
|
|
</task>
|
|
|
|
<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>
|
|
|
|
<task id="LOCAL-00585" summary=" 商户申请">
|
|
|
|
<created>1573543475505</created>
|
|
|
|
<option name="number" value="00585" />
|
|
|
|
<option name="presentableId" value="LOCAL-00585" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573543475505</updated>
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00586" summary=" 商户申请">
|
|
|
|
<created>1573543777045</created>
|
|
|
|
<option name="number" value="00586" />
|
|
|
|
<option name="presentableId" value="LOCAL-00586" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573543777045</updated>
|
|
|
|
<workItem from="1573605070739" duration="14778000" />
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00587" summary=" 商户申请">
|
|
|
|
<created>1573544083647</created>
|
|
...
|
...
|
@@ -767,11 +745,32 @@ |
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573628328173</updated>
|
|
|
|
</task>
|
|
|
|
<option name="localTasksCounter" value="633" />
|
|
|
|
<task id="LOCAL-00633" summary="后台bug">
|
|
|
|
<created>1573628698000</created>
|
|
|
|
<option name="number" value="00633" />
|
|
|
|
<option name="presentableId" value="LOCAL-00633" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573628698000</updated>
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00634" summary="后台bug">
|
|
|
|
<created>1573628748597</created>
|
|
|
|
<option name="number" value="00634" />
|
|
|
|
<option name="presentableId" value="LOCAL-00634" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573628748597</updated>
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00635" summary="后台bug">
|
|
|
|
<created>1573628779114</created>
|
|
|
|
<option name="number" value="00635" />
|
|
|
|
<option name="presentableId" value="LOCAL-00635" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573628779114</updated>
|
|
|
|
</task>
|
|
|
|
<option name="localTasksCounter" value="636" />
|
|
|
|
<servers />
|
|
|
|
</component>
|
|
|
|
<component name="TimeTrackingManager">
|
|
|
|
<option name="totallyTimeSpent" value="438411000" />
|
|
|
|
<option name="totallyTimeSpent" value="438560000" />
|
|
|
|
</component>
|
|
|
|
<component name="ToolWindowManager">
|
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
...
|
...
|
@@ -1177,13 +1176,14 @@ |
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/view/dashboard/index.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="374">
|
|
|
|
<caret line="493" column="50" lean-forward="true" selection-start-line="493" selection-start-column="50" selection-end-line="493" selection-end-column="50" />
|
|
|
|
<caret line="493" column="91" selection-start-line="493" selection-start-column="91" selection-end-line="493" selection-end-column="91" />
|
|
|
|
<folding>
|
|
|
|
<element signature="e#3513#5412#0" />
|
|
|
|
<element signature="e#5423#10316#0" />
|
|
|
|
<element signature="e#10334#15406#0" />
|
|
|
|
<element signature="e#15431#17226#0" />
|
|
|
|
<element signature="e#17240#20059#0" />
|
|
|
|
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#!!top" expanded="true" />
|
|
|
|
</folding>
|
|
|
|
</state>
|
|
|
|
</provider>
|
...
|
...
|
|
