...
|
...
|
@@ -6,7 +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/controller/Dashboard.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/Dashboard.php" 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" />
|
...
|
...
|
@@ -38,8 +37,8 @@ |
|
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/view/dashboard/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="521">
|
|
|
<caret line="462" column="88" selection-start-line="462" selection-start-column="88" selection-end-line="462" selection-end-column="88" />
|
|
|
<state relative-caret-position="181">
|
|
|
<caret line="430" column="40" selection-start-line="430" selection-start-column="40" selection-end-line="430" selection-end-column="40" />
|
|
|
<folding>
|
|
|
<element signature="e#3513#5412#0" />
|
|
|
<element signature="e#5423#10316#0" />
|
...
|
...
|
@@ -413,21 +412,7 @@ |
|
|
<workItem from="1573259331081" duration="30435000" />
|
|
|
<workItem from="1573432217070" duration="2199000" />
|
|
|
<workItem from="1573519427130" duration="17475000" />
|
|
|
<workItem from="1573605070739" duration="13596000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00580" summary=" 商户申请">
|
|
|
<created>1573542164527</created>
|
|
|
<option name="number" value="00580" />
|
|
|
<option name="presentableId" value="LOCAL-00580" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573542164527</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00581" summary=" 商户申请">
|
|
|
<created>1573542341131</created>
|
|
|
<option name="number" value="00581" />
|
|
|
<option name="presentableId" value="LOCAL-00581" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573542341131</updated>
|
|
|
<workItem from="1573605070739" duration="13929000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00582" summary=" 商户申请">
|
|
|
<created>1573542575057</created>
|
...
|
...
|
@@ -758,11 +743,25 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573626294912</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="629" />
|
|
|
<task id="LOCAL-00629" summary="后台bug">
|
|
|
<created>1573627704456</created>
|
|
|
<option name="number" value="00629" />
|
|
|
<option name="presentableId" value="LOCAL-00629" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573627704456</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00630" summary="后台bug">
|
|
|
<created>1573627771014</created>
|
|
|
<option name="number" value="00630" />
|
|
|
<option name="presentableId" value="LOCAL-00630" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573627771014</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="631" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="437378000" />
|
|
|
<option name="totallyTimeSpent" value="437711000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -1167,8 +1166,8 @@ |
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/view/dashboard/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="521">
|
|
|
<caret line="462" column="88" selection-start-line="462" selection-start-column="88" selection-end-line="462" selection-end-column="88" />
|
|
|
<state relative-caret-position="181">
|
|
|
<caret line="430" column="40" selection-start-line="430" selection-start-column="40" selection-end-line="430" selection-end-column="40" />
|
|
|
<folding>
|
|
|
<element signature="e#3513#5412#0" />
|
|
|
<element signature="e#5423#10316#0" />
|
...
|
...
|
|